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

Merge branch 'android12-5.4' into 'android12-5.4-lts'



Sync up with android12-5.4 for the following commits:

37c7c8d4 UPSTREAM: drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions
bdf17ba6 UPSTREAM: x86/pci: Fix the function type for check_reserved_t
5b673be0 FROMGIT: USB: gadget: bRequestType is a bitfield, not a enum
c08b8832 UPSTREAM: aio: fix use-after-free due to missing POLLFREE handling
4781852c UPSTREAM: aio: keep poll requests on waitqueue until completed
9dcc14f6 UPSTREAM: signalfd: use wake_up_pollfree()
e2f186a1 UPSTREAM: binder: use wake_up_pollfree()
44bababb UPSTREAM: wait: add wake_up_pollfree()
f49b6425 UPSTREAM: USB: gadget: zero allocate endpoint 0 buffers
fa64a30a UPSTREAM: USB: gadget: detect too-big endpoint 0 requests
12a69ef5 UPSTREAM: HID: check for valid USB device for many HID drivers
4fd09f7a UPSTREAM: HID: wacom: fix problems when device is not a valid USB device
058f168e UPSTREAM: HID: bigbenff: prevent null pointer dereference
610bdbf8 UPSTREAM: HID: add USB_HID dependancy on some USB HID drivers
027774af UPSTREAM: HID: add USB_HID dependancy to hid-chicony
553fa87e UPSTREAM: HID: add USB_HID dependancy to hid-prodikeys
4a83f2f6 UPSTREAM: HID: add hid_is_usb() function to make it simpler for USB detection
93698d02 ANDROID: ABI: Update symbols to unisoc whitelist for the 22st
97b7ffb3 ANDROID: f2fs: check nr_pages for readahead
0bbc71d8 ANDROID: usb: gadget: f_accessory: Mitgate handling of non-existent USB request
697fba25 FROMGIT: binder: fix test regression due to sender_euid change
3070f4b0 BACKPORT: binder: use cred instead of task for getsecid
f51c08be BACKPORT: binder: use cred instead of task for selinux checks
a850383d BACKPORT: binder: use euid from cred instead of using task
88d88955 ANDROID: GKI: psci: add hook to check if cpu is allowed to power off
2cdbd9b4 ANDROID: setlocalversion: make KMI_GENERATION optional
879962cb ANDROID: ABI: Update symbols to unisoc whitelist for the 21st
b9c4f1b9 ANDROID: ABI: Update symbols to unisoc whitelist for the twentieth time
60bad4df ANDROID: userfaultfd: Fix untag pointer in userfaultfd_continue()

Also update the .xml file for the following new symbols that are now
being tracked:

Leaf changes summary: 13 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 11 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 2 Added variables

11 Added functions:

  [A] 'function scsi_device* __scsi_add_device(Scsi_Host*, uint, uint, u64, void*)'
  [A] 'function void icmp6_send(sk_buff*, u8, u8, __u32, const in6_addr*, const inet6_skb_parm*)'
  [A] 'function int ip6_find_1stfragopt(sk_buff*, u8**)'
  [A] 'function __be32 ipv6_select_ident(net*, const in6_addr*, const in6_addr*)'
  [A] 'function ssize_t memory_read_from_buffer(void*, size_t, loff_t*, void*, size_t)'
  [A] 'function void pm_get_active_wakeup_sources(char*, size_t)'
  [A] 'function int scsi_test_unit_ready(scsi_device*, int, int, scsi_sense_hdr*)'
  [A] 'function void sock_wfree(sk_buff*)'
  [A] 'function int tracepoint_probe_register(tracepoint*, void*, void*)'
  [A] 'function int ufshcd_read_desc_param(ufs_hba*, desc_idn, int, u8, u8*, u8)'
  [A] 'function xfrm_state_afinfo* xfrm_state_afinfo_get_rcu(unsigned int)'

2 Added variables:

  [A] 'tracepoint __tracepoint_android_vh_psci_cpu_suspend'
  [A] 'tracepoint __tracepoint_android_vh_psci_tos_resident_on'

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