Commit ed6634a5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 'android14-6.1' into 'android14-6.1-lts'



This catches the -lts branch up with all of the recent changes that have
gone into the non-lts branch, INCLUDING the ABI update which we want
here to ensure that we do NOT break any newly added dependent symbols
(and to bring back in the reverts that were required before the ABI
break).

This includes the following commits:

0a859e78 ANDROID: GKI: Include kheaders in gki_system_dlkm_modules
35fe0d39 ANDROID: 6/16/2023 KMI update
fcc5e942 ANDROID: sched: Add parameter to android_rvh_schedule.
d4dd4d9f ANDROID: GKI: provide more padding for struct usb_phy
bb9c8797 ANDROID: GKI enable CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
a7b1da66 FROMGIT: arm64: set __exception_irq_entry with __irq_entry as a default
d73b3af2 ANDROID: GKI: update symbol list file for xiaomi
73185e2d ANDROID: Remove all but top-level OWNERS
1090306d ANDROID: Enable GKI Dr. No Enforcement
16c18c49 ANDROID: 6/16/2023 KMI update
fcc32be0 ANDROID: virt: gunyah: Sync with latest platform ops
69a3ec73 FROMGIT: usb: gadget: udc: core: Prevent soft_connect_store() race
18b677ff FROMGIT: usb: gadget: udc: core: Offload usb_udc_vbus_handler processing
a1741f9c UPSTREAM: Bluetooth: fix debugfs registration
d890debd UPSTREAM: Bluetooth: hci_sync: add lock to protect HCI_UNREGISTER
855c5479 UPSTREAM: net/ipv6: fix bool/int mismatch for skip_notify_on_dev_down
b0fa6dd2 UPSTREAM: neighbour: fix unaligned access to pneigh_entry
1707d64d UPSTREAM: tcp: deny tcp_disconnect() when threads are waiting
a7cd7a3d ANDROID: sound: usb: Add vendor's hooking interface
2c6f8037 ANDROID: GKI: USB: XHCI: add Android ABI padding to struct xhci_driver_overrides
cd3b5ff5 ANDROID: usb: host: add address_device to xhci overrides
e3ff5d6b UPSTREAM: bpf, sockmap: Avoid potential NULL dereference in sk_psock_verdict_data_ready()
07873e75 UPSTREAM: bpf, sockmap: Incorrectly handling copied_seq
e218734b UPSTREAM: bpf, sockmap: Wake up polling after data copy
f9cc0b7f UPSTREAM: bpf, sockmap: TCP data stall on recv before accept
028591f2 UPSTREAM: bpf, sockmap: Handle fin correctly
e69ad7c8 UPSTREAM: bpf, sockmap: Improved check for empty queue
ecfcbe21 UPSTREAM: bpf, sockmap: Reschedule is now done through backlog
42fcf3b6 UPSTREAM: bpf, sockmap: Convert schedule_work into delayed_work
a5905100 UPSTREAM: bpf, sockmap: Pass skb ownership through read_skb
86409bb4 ANDROID: virt: gunyah: Sync with latest Gunyah patches
705a9b5f ANDROID: virt: gunyah: Sync with latest documentation and sample
60662882 FROMLIST: usb: xhci-plat: add xhci_plat_priv_overwrite
6496f6cf ANDROID: usb: host: export symbols for xhci hooks usage
90ab8e7f ANDROID: usb: host: add xhci hooks for USB offload

Change-Id: I895db08515a0bc14c4548bb28b61acb1414a94cd
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3a63e655 0a859e78
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment