Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 61766d2f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'android11-5.4.290_r00' into android11-5.4



This merges the android11-5.4.290_r00 tag into the android11-5.4 branch,
catching it up with the latest LTS releases.

It contains the following commits:

* aa7664d1 Revert "net: net_namespace: Optimize the code"
* d85e176a Revert "net: add exit_batch_rtnl() method"
* 9a42fba6 Revert "gtp: use exit_batch_rtnl() method"
* c4395bd9 Revert "gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp()."
* 67d6b1a6 Revert "gtp: Destroy device along with udp socket's netns dismantle."
*   21c9625b Merge 5.4.290 into android11-5.4-lts
|\
| * 856a2248 Linux 5.4.290
| * 4b7032d0 Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals
| * 1f91ebde xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals
| * 9793206f drm/v3d: Assign job pointer to NULL before signaling the fence
| * 9e87fc21 Input: xpad - add support for wooting two he (arm)
| * 20c54dc1 Input: xpad - add unofficial Xbox 360 wireless receiver clone
| * e9ba8234 Input: atkbd - map F23 key to support default copilot shortcut
| * 76e7577b Revert "usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null"
| * fa4c7472 USB: serial: quatech2: fix null-ptr-deref in qt2_process_read_urb()
| * 448100a2 ext4: fix slab-use-after-free in ext4_split_extent_at()
| * 34b2d384 ext4: avoid ext4_error()'s caused by ENOMEM in the truncate path
| * f21636f2 vfio/platform: check the bounds of read/write syscalls
| * 3c4423b0 net/xen-netback: prevent UAF in xenvif_flush_hash()
| * 4b978070 net: xen-netback: hash.c: Use built-in RCU list checking
| * d3043652 signal/m68k: Use force_sigsegv(SIGSEGV) in fpsp040_die
| * 28810b2a m68k: Add missing mmap_read_lock() to sys_cacheflush()
| * 2354a750 m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal
| * 2b0bd505 gfs2: Truncate address space when flipping GFS2_DIF_JDATA flag
| * d26c6ec1 irqchip/sunxi-nmi: Add missing SKIP_WAKE flag
| * c7cbdb50 scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request
| * 820bc912 ASoC: wm8994: Add depends on MFD core
| * 695fb0b9 net: fix data-races around sk->sk_forward_alloc
| * e19acb19 scsi: sg: Fix slab-use-after-free read in sg_release()
| * a61a1742 ipv6: avoid possible NULL deref in rt6_uncached_list_flush_dev()
| * 95e4f62d hrtimers: Handle CPU state correctly on hotplug
| * 1a544a2d irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly
| * 84c4ed15 fs/proc: fix softlockup in __read_vmcore (part 2)
| * fbd7d5d9 net: ethernet: xgbe: re-add aneg to supported features in PHY quirks
| * fb6114c8 nvmet: propagate npwg topology
| * df19e2d7 poll_wait: add mb() to fix theoretical race between waitqueue_active() and .poll()
| * be1d9d4c kheaders: Ignore silly-rename files
| * 296b89c5 hfs: Sanity check the root record
| * 0d11dc30 mac802154: check local interfaces before deleting sdata list
| * 5d2b25cb i2c: mux: demux-pinctrl: check initial mux selection, too
| * 1bd6303d drm/v3d: Ensure job pointer is set to NULL after job completion
| * 8e87be55 nfp: bpf: prevent integer overflow in nfp_bpf_event_output()
| * c986380c gtp: Destroy device along with udp socket's netns dismantle.
| * 574c3f3f gtp: Use for_each_netdev_rcu() in gtp_genl_dump_pdp().
| * 85d96633 gtp: use exit_batch_rtnl() method
| * 21313155 net: add exit_batch_rtnl() method
| * 378b81b0 net: net_namespace: Optimize the code
| * b42e21d0 net: ethernet: ti: cpsw_ale: Fix cpsw_ale_get_field()
| * c8d179f3 sctp: sysctl: rto_min/max: avoid using current->nsproxy
| * 58f9e20e ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv
| * a57944e9 ocfs2: correct return value of ocfs2_local_free_info()
| * 1abde074 phy: core: Fix that API devm_of_phy_provider_unregister() fails to unregister the phy provider
| * 5c51a223 phy: core: fix code style in devm_of_phy_provider_unregister
| * d6c8871e arm64: dts: rockchip: add hevc power domain clock to rk3328
| * 2c574e1a arm64: dts: rockchip: add #power-domain-cells to power domain nodes
| * 2aa7a508 arm64: dts: rockchip: fix pd_tcpc0 and pd_tcpc1 node position on rk3399
| * a0dfff81 arm64: dts: rockchip: fix defines in pd_vio node for rk3399
| * 56c85e6b iio: inkern: call iio_device_put() only on mapped devices
| * b549c90b iio: adc: at91: call input_free_device() on allocated iio_dev
| * 5856a854 iio: adc: ti-ads124s08: Use gpiod_set_value_cansleep()
| * 4bb2b90f iio: gyro: fxas21002c: Fix missing data update in trigger handler
| * 1c80a098 iio: adc: ti-ads8688: fix information leak in triggered buffer
| * 0871eb8d iio: imu: kmx61: fix information leak in triggered buffer
| * 13e56229 iio: light: vcnl4035: fix information leak in triggered buffer
| * 03fa4762 iio: dummy: iio_simply_dummy_buffer: fix information leak in triggered buffer
| * 9629ff1a iio: pressure: zpa2326: fix information leak in triggered buffer
| * bfe60030 usb: gadget: f_fs: Remove WARN_ON in functionfs_bind
| * b24a6afa usb: fix reference leak in usb_new_device()
| * 7369c8ff USB: core: Disable LPM only for non-suspended ports
| * 01af472c USB: usblp: return error when setting unsupported protocol
| * f5f33fb5 usb: gadget: u_serial: Disable ep before setting port to null to fix the crash caused by port being null
| * faa0eeaf USB: serial: cp210x: add Phoenix Contact UPS Device
| * a5754f73 usb-storage: Add max sectors quirk for Nokia 208
| * dd4f2d93 staging: iio: ad9832: Correct phase range check
| * 9d16b310 staging: iio: ad9834: Correct phase range check
| * dffc4f7d USB: serial: option: add Neoway N723-EA support
| * f8d57de3 USB: serial: option: add MeiG Smart SRM815
| * 04301fad drm/amd/display: increase MAX_SURFACES to the value supported by hw
| * 9771233b ACPI: resource: Add Asus Vivobook X1504VAP to irq1_level_low_skip_override[]
| * b03307c1 ACPI: resource: Add TongFang GM5HG0A to irq1_edge_low_force_override[]
| * 8a9315e6 drm/amd/display: Add check for granularity in dml ceil/floor helpers
| * 10c869a5 sctp: sysctl: auth_enable: avoid using current->nsproxy
| * 1031462a sctp: sysctl: cookie_hmac_alg: avoid using current->nsproxy
| * ec037fe8 dm thin: make get_first_thin use rcu-safe list first function
| * 6429f52e tls: Fix tls_sw_sendmsg error handling
| * 9858f4af net_sched: cls_flow: validate TCA_FLOW_RSHIFT attribute
| * 69c31257 tcp/dccp: allow a connection when sk_max_ack_backlog is zero
| * 736fe12c tcp/dccp: complete lockless accesses to sk->sk_max_ack_backlog
| * 0f25193e net: 802: LLC+SNAP OID:PID lookup on start of skb data
| * ca254b28 ieee802154: ca8210: Add missing check for kfifo_alloc() in ca8210_probe()
| * e231d039 dm array: fix cursor index when skipping across block boundaries
| * 28c628d2 dm array: fix unreleased btree blocks on closing a faulty array cursor
| * 9c7c03d0 dm array: fix releasing a faulty array block twice in dm_array_cursor_end
| * 82235ad5 jbd2: flush filesystem device before updating tail sequence
* 0e97c4cf Merge branch 'android11-5.4' into android11-5.4-lts

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