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

Skip to content
Commit 3d018686 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



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

It contains the following commits:

* 027c685e Revert "coredump: hand a pidfd to the usermode coredump helper"
*   cd881391 Merge 5.4.294 into android11-5.4-lts
|\
| * 44613a25 Linux 5.4.294
| * c3ccbd86 xen/swiotlb: relax alignment requirements
| * 9fe7b080 platform/x86: thinkpad_acpi: Ignore battery threshold change event notification
| * 7614a710 platform/x86: fujitsu-laptop: Support Lifebook S2110 hotkeys
| * acfc86d9 spi: spi-sun4i: fix early activation
| * dd1283d7 um: let 'make clean' properly clean underlying SUBARCH as well
| * e0dad9d0 platform/x86: thinkpad_acpi: Support also NEC Lavie X1475JAS
| * c04f5dc4 nfs: don't share pNFS DS connections between net namespaces
| * f993c182 HID: quirks: Add ADATA XPG alpha wireless mouse support
| * 79bf58c7 coredump: hand a pidfd to the usermode coredump helper
| * 607ff004 fork: use pidfd_prepare()
| * 0a841d0a pid: add pidfd_prepare()
| * 53df781e pidfd: check pid has attached task in fdinfo
| * d4dfdd50 coredump: fix error handling for replace_fd()
| * e5bee633 net_sched: hfsc: Address reentrant enqueue adding class to eltree twice
| * 9f5748b6 smb: client: Reset all search buffer pointers when releasing buffer
| * aee067e8 smb: client: Fix use-after-free in cifs_fill_dirent
| * 80cf7ecf drm/i915/gvt: fix unterminated-string-initialization warning
| * 5146c27b netfilter: nf_tables: do not defer rule destruction via call_rcu
| * 9eee6097 netfilter: nf_tables: wait for rcu grace period on net_device removal
| * 791332ec netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx
| * 86a8bec7 kbuild: Disable -Wdefault-const-init-unsafe
| * 5b2f7f04 spi: spi-fsl-dspi: restrict register range for regmap access
| * 251bfa69 mm/page_alloc.c: avoid infinite retries caused by cpuset race
| * 25b5d466 memcg: always call cond_resched() after fn()
| * c603209c drm/edid: fixed the bug that hdr metadata was not reset
| * 7ff230d8 llc: fix data loss when reading from a socket in llc_ui_recvmsg()
| * c0e05a76 ALSA: pcm: Fix race of buffer access at PCM OSS layer
| * 19f553a1 can: bcm: add missing rcu read protection for procfs content
| * 8f1c0225 can: bcm: add locking for bcm_op runtime updates
| * 5bff312b crypto: algif_hash - fix double free in hash_accept
| * 1034e331 sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue()
| * 617fbcc1 net: dwmac-sun8i: Use parsed internal PHY address instead of 1
| * 6a31da4a bridge: netfilter: Fix forwarding of fragmented packets
| * 86df072c xfrm: Sanitize marks before insert
| * 628fb001 __legitimize_mnt(): check for MNT_SYNC_UMOUNT should be under mount_lock
| * 511c134b xenbus: Allow PVH dom0 a non-local xenstore
| * 5755b673 btrfs: correct the order of prelim_ref arguments in btrfs__prelim_ref
| * 62655384 nvmet-tcp: don't restore null sk_state_change
| * c16d062b ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013
| * 381803dc pinctrl: meson: define the pull up/down resistor value as 60 kOhm
| * cf1e0fb9 drm: Add valid clones check
| * 70589698 drm/atomic: clarify the rules around drm_atomic_state->allow_modeset
| * c413172d regulator: ad5398: Add device tree support
| * 28780cb5 wifi: rtw88: Don't use static local variable in rtw8822b_set_tx_power_index_by_rate
| * 8079ba28 bpftool: Fix readlink usage in get_fd_type
| * 2d16514e HID: usbkbd: Fix the bit shift number for LED_KANA
| * 95afb4af scsi: st: Restore some drive settings after reset
| * 82f3c2e2 scsi: lpfc: Handle duplicate D_IDs in ndlp search-by D_ID routine
| * 55fbc3c0 rcu: fix header guard for rcu_all_qs()
| * be6ab688 rcu: handle quiescent states for PREEMPT_RCU=n, PREEMPT_COUNT=y
| * 02a33b10 vxlan: Annotate FDB data races
| * c4e068ad hwmon: (xgene-hwmon) use appropriate type for the latency value
| * 7d024eea ip: fib_rules: Fetch net from fib_rule in fib[46]_rule_configure().
| * 683b76fc net/mlx5e: reduce rep rxq depth to 256 for ECPF
| * 7df118ff net/mlx5e: set the tx_queue_len for pfifo_fast
| * c6406c59 net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB
| * 3cd53e51 phy: core: don't require set_mode() callback for phy_get_mode() to work
| * ebe4325f net/mlx4_core: Avoid impossible mlx4_db_alloc() order value
| * 99d862c9 smack: recognize ipv4 CIPSO w/o categories
| * a0c653ad pinctrl: devicetree: do not goto err when probing hogs in pinctrl_dt_to_map
| * 5a443be4 ASoC: ops: Enforce platform maximum on initial value
| * a8cb81bf net/mlx5: Apply rate-limiting to high temperature warning
| * 175d63d9 net/mlx5: Modify LSB bitmask in temperature event to include only the first bit
| * 03eefaed ACPI: HED: Always initialize before evged
| * 0f0670b3 PCI: Fix old_size lower bound in calculate_iosize() too
| * e3f84079 EDAC/ie31200: work around false positive build warning
| * a3d89f1c net: pktgen: fix access outside of user given buffer in pktgen_thread_write()
| * 94e48d31 wifi: rtw88: Fix rtw_init_ht_cap() for RTL8814AU
| * 4e03d06f scsi: mpt3sas: Send a diag reset if target reset fails
| * f188d186 MIPS: pm-cps: Use per-CPU variables as per-CPU, not per-core
| * bc7e356d MIPS: Use arch specific syscall name match function
| * c11cae64 cpuidle: menu: Avoid discarding useful information
| * 69f7d801 x86/nmi: Add an emergency handler in nmi_desc & use it in nmi_shootdown_cpus()
| * 611fba29 bonding: report duplicate MAC address in all situations
| * d5dbfdf8 net: xgene-v2: remove incorrect ACPI_PTR annotation
| * 0b2cb9ea drm/amdkfd: KFD release_work possible circular locking
| * d47d8e00 net/mlx5: Avoid report two health errors on same syndrome
| * dace5678 fpga: altera-cvp: Increase credit timeout
| * 7725d40b drm/mediatek: mtk_dpi: Add checks for reg_h_fre_con existence
| * fdd98fac hwmon: (gpio-fan) Add missing mutex locks
| * a8c22ec3 x86/bugs: Make spectre user default depend on MITIGATION_SPECTRE_V2
| * cb071c4d net: pktgen: fix mpls maximum labels list parsing
| * ef95c6b3 pinctrl: bcm281xx: Use "unsigned int" instead of bare "unsigned"
| * 2ad41beb media: cx231xx: set device_caps for 417
| * ceaf195e orangefs: Do not truncate file size
| * c614584c dm cache: prevent BUG_ON by blocking retries on failed device resumes
| * 33cc2620 media: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe()
| * b468b0d8 ARM: tegra: Switch DSI-B clock parent to PLLD on Tegra114
| * 0819729b ieee802154: ca8210: Use proper setters and getters for bitwise types
| * cadb64fe rtc: ds1307: stop disabling alarms on probe
| * 14e8c9c0 powerpc/prom_init: Fixup missing #size-cells on PowerBook6,7
| * 4bab7a55 mmc: sdhci: Disable SD card clock before changing parameters
| * 5972d854 netfilter: conntrack: Bound nf_conntrack sysctl writes
| * 322e82c5 posix-timers: Add cond_resched() to posix_timer_add() search loop
| * baedd1ef xen: Add support for XenServer 6.1 platform device
| * 8a63c8d9 dm: restrict dm device size to 2^63-512 bytes
| * ac7d620c kbuild: fix argument parsing in scripts/config
| * 47d75cd6 scsi: st: ERASE does not change tape location
| * d885df76 scsi: st: Tighten the page format heuristics with MODE SELECT
| * 3fc269dc ext4: reorder capability check last
| * 87455303 um: Update min_low_pfn to match changes in uml_reserved
| * ba38e646 um: Store full CSGSFS and SS register from mcontext
| * b8f420a5 btrfs: send: return -ENAMETOOLONG when attempting a path that is too long
| * 9afb72df btrfs: avoid linker error in btrfs_find_create_tree_block()
| * 1fb065f2 i2c: pxa: fix call balance of i2c->clk handling routines
| * 65845b2f mmc: host: Wait for Vdd to settle on card power off
| * 2bd4a938 libnvdimm/labels: Fix divide error in nd_label_data_init()
| * 995c7268 pNFS/flexfiles: Report ENETDOWN as a connection error
| * cf7c3d7e tools/build: Don't pass test log files to linker
| * fa1cd321 dql: Fix dql->limit value when reset.
| * 0f0fdd5a SUNRPC: rpc_clnt_set_transport() must not change the autobind setting
| * c30bc4d2 NFSv4: Treat ENETUNREACH errors as fatal for state recovery
| * b940374c fbdev: core: tileblit: Implement missing margin clearing for tileblit
| * e9eb6288 fbdev: fsl-diu-fb: add missing device_remove_file()
| * f60ba8bd mailbox: use error ret code of of_parse_phandle_with_args()
| * 94a78c61 kconfig: merge_config: use an empty file as initfile
| * 97384102 cgroup: Fix compilation issue due to cgroup_mutex not being exported
| * c668e305 dma-mapping: avoid potential unused data compilation warning
| * 571ce6b6 scsi: target: iscsi: Fix timeout on deleted connection
| * 6712dc21 openvswitch: Fix unsafe attribute parsing in output_userspace()
| * 2e765124 Input: synaptics - enable InterTouch on TUXEDO InfinityBook Pro 14 v5
| * 2e45aaa4 Input: synaptics - enable SMBus for HP Elitebook 850 G1
| * 0ebb19c6 clocksource/i8253: Use raw_spinlock_irqsave() in clockevent_i8253_disable()
| * 2007f9dc phy: renesas: rcar-gen3-usb2: Set timing registers only once
| * 01bd47af phy: Fix error handling in tegra_xusb_port_init
| * 1f73ccc6 ALSA: es1968: Add error handling for snd_pcm_hw_constraint_pow2()
| * b8ee9fe5 ACPI: PPTT: Fix processor subtable walk
| * aeed6418 dmaengine: Revert "dmaengine: dmatest: Fix dmatest waiting less when interrupted"
| * eb046212 NFSv4/pnfs: Reset the layout state after a layoutreturn
| * 1057c7ae NFSv4/pnfs: pnfs_set_layout_stateid() should update the layout cred
| * 7f42126b qlcnic: fix memory leak in qlcnic_sriov_channel_cfg_cmd()
| * 8887470a ALSA: sh: SND_AICA should depend on SH_DMA_API
| * 7d2bbcf8 net: dsa: sja1105: discard incoming frames in BR_STATE_LISTENING
| * b383443f spi: loopback-test: Do not split 1024-byte hexdumps
| * db6f5ee1 nfs: handle failure of nfs_get_lock_context in unlock path
| * 7c7c80c3 RDMA/rxe: Fix slab-use-after-free Read in rxe_queue_cleanup bug
| * df6fbd83 iio: chemical: sps30: use aligned_s64 for timestamp
| * d04c98d2 iio: adc: ad7768-1: Fix insufficient alignment of timestamp.
| * 4ec0ce14 staging: axis-fifo: Correct handling of tx_fifo_depth for size validation
| * 51d31e08 staging: axis-fifo: avoid parsing ignored device tree properties
| * 5afeeda4 staging: axis-fifo: Remove hardware resets for user errors
| * 7570ce5b staging: axis-fifo: replace spinlock with mutex
| * af2fa177 platform/x86: asus-wmi: Fix wlan_ctrl_by_user detection
| * 80a00ec0 do_umount(): add missing barrier before refcount checks in sync case
| * 746723df nvme: unblock ctrl state transition for firmware update
| * c775b024 MIPS: Fix MAX_REG_OFFSET
| * a1907a72 iio: adc: dln2: Use aligned_s64 for timestamp
| * 183b10e9 types: Complement the aligned types with signed 64-bit one
| * 4f72a8dc usb: usbtmc: Fix erroneous generic_read ioctl return
| * 85934459 usb: usbtmc: Fix erroneous wait_srq ioctl return
| * 8d9a5eae usb: usbtmc: Fix erroneous get_stb ioctl error returns
| * 388842c3 USB: usbtmc: use interruptible sleep in usbtmc_read
| * 9dda1e2a usb: typec: ucsi: displayport: Fix NULL pointer access
| * 64d5ed26 usb: typec: tcpm: delay SNK_TRY_WAIT_DEBOUNCE to SRC_TRYWAIT transition
| * 073a7db0 ocfs2: stop quota recovery before disabling quotas
| * ca68863a ocfs2: implement handshaking with ocfs2 recovery thread
| * 58b6a818 ocfs2: switch osb->disable_recovery to enum
| * 93799fb9 module: ensure that kobject_put() is safe for module type kobjects
| * 0e94a246 xenbus: Use kref to track req lifetime
| * 30a7a793 usb: uhci-platform: Make the clock really optional
| * 4db7d923 iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_tagged_fifo
| * f06a1a19 iio: imu: st_lsm6dsx: fix possible lockup in st_lsm6dsx_read_fifo
| * 759f844d iio: adis16201: Correct inclinometer channel resolution
| * 196d4c5d iio: adc: ad7606: fix serial register access
| * 7ff32a51 staging: iio: adc: ad7816: Correct conditional logic for store mode
| * 7c5a9ce5 Input: synaptics - enable InterTouch on Dell Precision M3800
| * ecf55804 Input: synaptics - enable InterTouch on Dynabook Portege X30L-G
| * daec2f45 Input: synaptics - enable InterTouch on Dynabook Portege X30-D
| * dfae1fe8 net: dsa: b53: fix learning on VLAN unaware bridges
| * 00cfc5fa netfilter: ipset: fix region locking in hash types
| * 99ff8a20 sch_htb: make htb_deactivate() idempotent
| * 54e57be2 scsi: target: Fix WRITE_SAME No Data Buffer crash
| * d184c654 dm: fix copying after src array boundaries
| * 2b65060c iommu/amd: Fix potential buffer overflow in parse_ivrs_acpihid
| * 50c061c6 arm64: dts: rockchip: fix iface clock-name on px30 iommus
| * d086cca9 usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling
| * b8feb22e usb: chipidea: ci_hdrc_imx: use dev_err_probe()
| * 33f2c608 usb: chipidea: imx: refine the error handling for hsic
| * 8604f111 usb: chipidea: imx: change hsic power regulator as optional
| * 0c241ded irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
| * 2fd802e0 irqchip/gic-v2m: Mark a few functions __init
| * 7c7d142b irqchip/gic-v2m: Add const to of_device_id
| * e6b45f4d sch_htb: make htb_qlen_notify() idempotent
| * 46795440 of: module: add buffer overflow check in of_modalias()
| * 844ae02c PCI: imx6: Skip controller_id generation logic for i.MX7D
| * b1d86312 net: fec: ERR007885 Workaround for conventional TX
| * 093855ce net: lan743x: Fix memleak issue when GSO enabled
| * 9e08de59 lan743x: fix endianness when accessing descriptors
| * a63d220f lan743x: remove redundant initialization of variable current_head_index
| * 38c10733 nvme-tcp: fix premature queue removal and I/O failover
| * 2fb48a0f net: dlink: Correct endianness handling of led_mode
| * 041f410a net_sched: qfq: Fix double list add in class with netem as child qdisc
| * 273bbcfa net_sched: hfsc: Fix a UAF vulnerability in class with netem as child qdisc
| * 5da3aad1 net_sched: drr: Fix double list add in class with netem as child qdisc
| * 505f5626 net/mlx5: E-Switch, Initialize MAC Address for Default GID
| * f4b0174e tracing: Fix oob write in trace_seq_to_buffer()
| * f4f23b2f dm: always update the array size in realloc_argv on success
| * 4673500f dm-integrity: fix a warning on invalid table line
| * 972bf75e wifi: brcm80211: fmac: Add error handling for brcmf_usb_dl_writeimage()
| * e5b3c827 amd-xgbe: Fix to ensure dependent features are toggled with RX checksum offload
| * 2a1aff36 parisc: Fix double SIGFPE crash
| * a4e8f244 i2c: imx-lpi2c: Fix clock count when probe defers
| * 48e5a0d2 EDAC/altera: Set DDR and SDMMC interrupt mask before registration
| * 796149df EDAC/altera: Test the correct error reg offset
* 8782a46e Merge android11-5.4 into android11-5.4-lts
* a38a5caa Merge 5.4.293 into android11-5.4-lts
* 9003e46d Merge branch 'android11-5.4' into android11-5.4-lts

Change-Id: I29ab69a194e178250e8138d0093a6e81826e3ae9
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 45cc7155 027c685e
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