Merge branch 'android11-5.4' into 'android11-5.4-lts'

Browse Source

Sync up with android11-5.4 for the following commits:

f2bbf1b7ba UPSTREAM: drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions
8f54ba9ae7 UPSTREAM: x86/pci: Fix the function type for check_reserved_t
983a7e7c98 FROMGIT: USB: gadget: bRequestType is a bitfield, not a enum
0e2d9234d4 UPSTREAM: aio: fix use-after-free due to missing POLLFREE handling
71cd014915 UPSTREAM: aio: keep poll requests on waitqueue until completed
480f70a4e1 UPSTREAM: signalfd: use wake_up_pollfree()
da5ecad710 UPSTREAM: binder: use wake_up_pollfree()
a20ea4a195 UPSTREAM: wait: add wake_up_pollfree()
425aade960 UPSTREAM: USB: gadget: zero allocate endpoint 0 buffers
4b95e275cf UPSTREAM: USB: gadget: detect too-big endpoint 0 requests
26ddf0ab2d UPSTREAM: HID: check for valid USB device for many HID drivers
89c9193d73 UPSTREAM: HID: wacom: fix problems when device is not a valid USB device
3b49ff9fcb UPSTREAM: HID: bigbenff: prevent null pointer dereference
56eb2fdbc1 UPSTREAM: HID: add USB_HID dependancy on some USB HID drivers
058d09a5c5 UPSTREAM: HID: add USB_HID dependancy to hid-chicony
edf5702216 UPSTREAM: HID: add USB_HID dependancy to hid-prodikeys
3d236ade79 UPSTREAM: HID: add hid_is_usb() function to make it simpler for USB detection

Change-Id: Ia1b6d54de14d3c7f9b8e6456c954280dfa3b4d59
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

...

This commit is contained in:

Greg Kroah-Hartman 2022-01-17 16:55:20 +01:00

parent 1b6f3f2708 f2bbf1b7ba

commit ed177b5545

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available