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

Merge tag 'android12-5.10.234_r00' into android12-5.10



This merges the android12-5.10.234_r00 tag into the android12-5.10 branch,
catching it up with the latest LTS releases.

It contains the following commits:

* 1caf8197 Revert "net: net_namespace: Optimize the code"
* cad4c9d8 Revert "net: add exit_batch_rtnl() method"
* 460a2ef9 Revert "gtp: use exit_batch_rtnl() method"
* 539048de Revert "gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp()."
* 88dc1ccb Revert "gtp: Destroy device along with udp socket's netns dismantle."
* b9ad2a18 Revert "fs: fix missing declaration of init_files"
* 87398606 Revert "loop: let set_capacity_revalidate_and_notify update the bdev size"
* a05d7b6a Revert "nvme: let set_capacity_revalidate_and_notify update the bdev size"
* a3622011 Revert "sd: update the bdev size in sd_revalidate_disk"
* f40d71e4 Revert "block: remove the update_bdev parameter to set_capacity_revalidate_and_notify"
*   fc74821c Merge 5.10.234 into android12-5.10-lts
|\
| * f0a53361 Linux 5.10.234
| * c762b769 Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals
| * 664760c4 xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals
| * 1f66a3a1 drm/v3d: Assign job pointer to NULL before signaling the fence
| * d2b55020 Input: xpad - add support for wooting two he (arm)
| * 098b8808 Input: xpad - add unofficial Xbox 360 wireless receiver clone
| * 5e9fed31 Input: atkbd - map F23 key to support default copilot shortcut
| * 99c866be Revert "usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null"
| * 94770cf7 USB: serial: quatech2: fix null-ptr-deref in qt2_process_read_urb()
| * 354aef2e wifi: iwlwifi: add a few rate index validity checks
| * 31bd7378 ipv4: ip_tunnel: Fix suspicious RCU usage warning in ip_tunnel_find()
| * d072ea24 Bluetooth: RFCOMM: Fix not validating setsockopt user input
| * d19a8650 vfio/platform: check the bounds of read/write syscalls
| * 553df82a signal/m68k: Use force_sigsegv(SIGSEGV) in fpsp040_die
| * f70103a4 m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal
| * 03c56665 net: sched: fix ets qdisc OOB Indexing
| * 8c41abc1 gfs2: Truncate address space when flipping GFS2_DIF_JDATA flag
| * 09f69865 ASoC: samsung: Add missing depends on I2C
| * 20019b1f irqchip/sunxi-nmi: Add missing SKIP_WAKE flag
| * 3ff6ce05 scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request
| * d5bd48f1 seccomp: Stub for !CONFIG_SECCOMP
| * c269af14 ASoC: samsung: Add missing selects for MFD_WM8994
| * 771f8a8a ASoC: wm8994: Add depends on MFD core
| * fe2c0bd6 net: fix data-races around sk->sk_forward_alloc
| * 285ce1f8 scsi: sg: Fix slab-use-after-free read in sg_release()
| * 7ffaf1a1 x86/xen: fix SLS mitigation in xen_hypercall_iret()
| * daeac89c vsock: prevent null-ptr-deref in vsock_*[has_data|has_space]
| * 18a7fc37 vsock/virtio: discard packets if the transport changes
| * a925a200 fou: remove warn in gue_gro_receive on unsupported protocol
| * f9f76ff7 nfsd: add list_head nf_gc to struct nfsd_file
| * 8a8b8301 ipv6: avoid possible NULL deref in rt6_uncached_list_flush_dev()
| * 83f5a87e blk-cgroup: Fix UAF in blkcg_unpin_online()
| * 60588975 RDMA/hns: Fix deadlock on SRQ async events.
| * 461091c2 vmalloc: fix accounting with i915
| * e8d3c53c drm/radeon: check bo_va->bo is non-NULL before using it
| * 85a9c98a iio: adc: rockchip_saradc: fix information leak in triggered buffer
| * 031538ff iio: imu: inv_icm42600: fix timestamps after suspend if sensor is on
| * 641b4041 iio: imu: inv_icm42600: fix spi burst write not supported
| * da55e762 Revert "PCI: Use preserve_config in place of pci_flags"
| * 14984139 hrtimers: Handle CPU state correctly on hotplug
| * d1099ad2 irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly
| * 2dfbb920 gpiolib: cdev: Fix use after free in lineinfo_changed_notify
| * 80da29de fs/proc: fix softlockup in __read_vmcore (part 2)
| * ae527bd2 vsock: reset socket state when de-assigning the transport
| * 3cde51df vsock/virtio: cancel close work in the destructor
| * f9710a5c net: ethernet: xgbe: re-add aneg to supported features in PHY quirks
| * 17dcfc0f x86/asm: Make serialize() always_inline
| * a722df50 nvmet: propagate npwg topology
| * 3f8b360c poll_wait: add mb() to fix theoretical race between waitqueue_active() and .poll()
| * 99db4267 kheaders: Ignore silly-rename files
| * 95597be4 fs: fix missing declaration of init_files
| * 2cf7601e hfs: Sanity check the root record
| * 98ea165a mac802154: check local interfaces before deleting sdata list
| * 3eb32997 i2c: rcar: fix NACK handling when being a target
| * 8d037f34 i2c: mux: demux-pinctrl: check initial mux selection, too
| * a34050f7 drm/v3d: Ensure job pointer is set to NULL after job completion
| * 72dc1345 net/mlx5: Fix RDMA TX steering prio
| * 47166d31 net/mlx5: Refactor mlx5_get_flow_namespace
| * 9f07d9fd net/mlx5: Add priorities for counters in RDMA namespaces
| * faf64fe8 nfp: bpf: prevent integer overflow in nfp_bpf_event_output()
| * 5f167834 gtp: Destroy device along with udp socket's netns dismantle.
| * 66f1864c gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp().
| * 320a0dea gtp: use exit_batch_rtnl() method
| * fae8bd0b net: add exit_batch_rtnl() method
| * 37fdbeb0 net: net_namespace: Optimize the code
| * bb36838d bpf: Fix bpf_sk_select_reuseport() memory leak
| * 9f7ad4eb net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()
| * a13d640d phy: usb: Fix clock imbalance for suspend/resume
| * 3bc29a49 phy: usb: Use slow clock for wake enabled suspend
| * 246428bf sctp: sysctl: rto_min/max: avoid using current->nsproxy
| * acec80d9 drm: adv7511: Fix use-after-free in adv7533_attach_dsi()
| * 49881fce drm: bridge: adv7511: use dev_err_probe in probe function
| * 3747465c drm: bridge: adv7511: unregister cec i2c device after cec adapter
| * 09a81754 drm/bridge: adv7533: Switch to devm MIPI-DSI helpers
| * 2c0106fd drm/mipi-dsi: Create devm device attachment
| * 5ad24956 drm/mipi-dsi: Create devm device registration
| * cb3a64b6 drm: bridge: adv7511: Remove redundant null check before clk_disable_unprepare
| * 8ff6f635 ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv
| * af45819b ocfs2: correct return value of ocfs2_local_free_info()
| * a8d08d9f phy: usb: Toggle the PHY power during init
| * 5917962b phy: usb: Add "wake on" functionality for newer Synopsis XHCI controllers
| * 5330de58 block: remove the update_bdev parameter to set_capacity_revalidate_and_notify
| * afa920d4 sd: update the bdev size in sd_revalidate_disk
| * 72224a75 nvme: let set_capacity_revalidate_and_notify update the bdev size
| * dddf7150 loop: let set_capacity_revalidate_and_notify update the bdev size
| * 5601c261 arm64: dts: rockchip: add hevc power domain clock to rk3328
| * 00360f3f arm64: dts: rockchip: add #power-domain-cells to power domain nodes
| * 35280996 iio: inkern: call iio_device_put() only on mapped devices
| * ac8d932e iio: adc: at91: call input_free_device() on allocated iio_dev
| * 1b7b9084 iio: adc: ti-ads124s08: Use gpiod_set_value_cansleep()
| * 2d72fc4a iio: gyro: fxas21002c: Fix missing data update in trigger handler
| * 3bf8d1e8 iio: adc: ti-ads8688: fix information leak in triggered buffer
| * a386d9d2 iio: imu: kmx61: fix information leak in triggered buffer
| * b0e9c11c iio: light: vcnl4035: fix information leak in triggered buffer
| * e1c1e8c0 iio: dummy: iio_simply_dummy_buffer: fix information leak in triggered buffer
| * d25f1fc2 iio: pressure: zpa2326: fix information leak in triggered buffer
| * 3e4d32cc usb: gadget: f_fs: Remove WARN_ON in functionfs_bind
| * 209b72d3 usb: fix reference leak in usb_new_device()
| * d9f78c90 USB: core: Disable LPM only for non-suspended ports
| * ee63cb22 USB: usblp: return error when setting unsupported protocol
| * 1062b648 usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null
| * 4c51407c usb: dwc3: gadget: fix writing NYET threshold
| * 258b3530 USB: serial: cp210x: add Phoenix Contact UPS Device
| * 09d4072a usb-storage: Add max sectors quirk for Nokia 208
| * 717b7360 staging: iio: ad9832: Correct phase range check
| * 38da4bab staging: iio: ad9834: Correct phase range check
| * e764b4e1 USB: serial: option: add Neoway N723-EA support
| * dad37217 USB: serial: option: add MeiG Smart SRM815
| * 66de7a25 md/raid5: fix atomicity violation in raid5_cache_count
| * 08765d4e scripts/sorttable: fix orc_sort_cmp() to maintain symmetry and transitivity
| * 88136f79 drm/amd/display: increase MAX_SURFACES to the value supported by hw
| * 2f8067b3 ACPI: resource: Add Asus Vivobook X1504VAP to irq1_level_low_skip_override[]
| * 522ddfb1 ACPI: resource: Add TongFang GM5HG0A to irq1_edge_low_force_override[]
| * 8c38baa0 riscv: Fix sleeping in invalid context in die()
| * 497471ba drm/amd/display: Add check for granularity in dml ceil/floor helpers
| * dc583e7e sctp: sysctl: auth_enable: avoid using current->nsproxy
| * 03ca51fa sctp: sysctl: cookie_hmac_alg: avoid using current->nsproxy
| * 2c1a42fb dm-ebs: don't set the flag DM_TARGET_PASSES_INTEGRITY
| * cd30a396 dm thin: make get_first_thin use rcu-safe list first function
| * 93403854 afs: Fix the maximum cell name length
| * a965f7f0 netfilter: conntrack: clamp maximum hashtable size to INT_MAX
| * 20892926 netfilter: nf_tables: imbalance in flowtable binding
| * 72e6ca38 tls: Fix tls_sw_sendmsg error handling
| * 53b7a676 cxgb4: Avoid removal of uninserted tid
| * 43658e4a net_sched: cls_flow: validate TCA_FLOW_RSHIFT attribute
| * 22e3f5ee tcp/dccp: allow a connection when sk_max_ack_backlog is zero
| * 9261b825 tcp/dccp: complete lockless accesses to sk->sk_max_ack_backlog
| * c9c0471e net: 802: LLC+SNAP OID:PID lookup on start of skb data
| * c2da4547 ieee802154: ca8210: Add missing check for kfifo_alloc() in ca8210_probe()
| * 4a6167ae netfilter: nft_dynset: honor stateful expressions in set definition
| * 01c4e22c ASoC: mediatek: disable buffer pre-allocation
| * d8cfbb87 exfat: fix the infinite loop in exfat_readdir()
| * 5c10baed dm array: fix cursor index when skipping across block boundaries
| * cb223d96 dm array: fix unreleased btree blocks on closing a faulty array cursor
| * fc1ef07c dm array: fix releasing a faulty array block twice in dm_array_cursor_end
| * 359abf6c jbd2: flush filesystem device before updating tail sequence
| * 0f2b2d9e ceph: give up on paths longer than PATH_MAX
* 55bef3bc Merge branch 'android12-5.10' into android12-5.10-lts

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