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

Merge commit 319eb614 ("ANDROID: abi preservation for fscrypt change in...


Merge commit 319eb614 ("ANDROID: abi preservation for fscrypt change in 5.10.154") into android13-5.10

This is the merge of the upstream LTS release of 5.10.154 into the
android13-5.10 branch.

It contains the following commits:

319eb614 ANDROID: abi preservation for fscrypt change in 5.10.154
c007a0aa Revert "serial: 8250: Let drivers request full 16550A feature probing"
ae6c45a1 Merge 5.10.154 into android13-5.10-lts
f5b40c0e Linux 5.10.154
bf506e36 ipc: remove memcg accounting for sops objects in do_semtimedop()
c6678c8f wifi: brcmfmac: Fix potential buffer overflow in brcmf_fweh_event_worker()
a6c57ade drm/i915/sdvo: Setup DDC fully before output init
b86830cc drm/i915/sdvo: Filter out invalid outputs more sensibly
9f3b8678 drm/rockchip: dsi: Force synchronous probe
23f1fc7c ext4,f2fs: fix readahead of verity data
e5cef906 KVM: x86: emulator: update the emulation mode after CR0 write
ce9261ac KVM: x86: emulator: introduce emulator_recalc_and_set_mode
c8a2fd7a KVM: x86: emulator: em_sysexit should update ctxt->mode
e0c74103 KVM: x86: Mask off reserved bits in CPUID.80000001H
9302ebc1 KVM: x86: Mask off reserved bits in CPUID.80000008H
cc40c5f3 KVM: x86: Mask off reserved bits in CPUID.8000001AH
bd64a88f KVM: x86: Mask off reserved bits in CPUID.80000006H
156451a6 ext4: fix BUG_ON() when directory entry has invalid rec_len
5370b965 ext4: fix warning in 'ext4_da_release_space'
c9598cf6 parisc: Avoid printing the hardware path twice
98f836e8 parisc: Export iosapic_serial_irq() symbol for serial port driver
814af9a3 parisc: Make 8250_gsc driver dependend on CONFIG_PARISC
29d106d0 perf/x86/intel: Add Cooper Lake stepping to isolation_ucodes[]
98f6e7c3 perf/x86/intel: Fix pebs event constraints for ICL
3be2d668 efi: random: Use 'ACPI reclaim' memory for random seed
83294f7c efi: random: reduce seed size to 32 bytes
f8e8cda8 fuse: add file_modified() to fallocate
cdf01c80 capabilities: fix potential memleak on error path from vfs_getxattr_alloc()
ff32d8a0 tracing/histogram: Update document for KEYS_MAX size
533bfacb tools/nolibc/string: Fix memcmp() implementation
f100a027 kprobe: reverse kp->flags when arm_kprobe failed
bef08acb tracing: kprobe: Fix memory leak in test_gen_kprobe/kretprobe_cmd()
2bf33b5e tcp/udp: Make early_demux back namespacified.
ea5f2fd4 ftrace: Fix use-after-free for dynamic ftrace_ops
06de93a4 btrfs: fix type of parameter generation in btrfs_get_dentry
e33ce54c coresight: cti: Fix hang in cti_disable_hw()
015ac18b binder: fix UAF of alloc->vma in race with munmap()
836686e1 memcg: enable accounting of ipc resources
e4e4b24b mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times
818c36b9 tcp/udp: Fix memory leak in ipv6_renew_options().
29997a6f fscrypt: fix keyring memory leak on mount failure
391cceee fscrypt: stop using keyrings subsystem for fscrypt_master_key
09240114 fscrypt: simplify master key locking
54c13d35 ALSA: usb-audio: Add quirks for MacroSilicon MS2100/MS2106 devices
a0e2577c block, bfq: protect 'bfqd->queued' by 'bfqd->lock'
26ca2ac0 Bluetooth: L2CAP: Fix attempting to access uninitialized memory
6b6f94fb Bluetooth: L2CAP: Fix accepting connection request for invalid SPSM
bfd5e62f i2c: piix4: Fix adapter not be removed in piix4_remove()
fc3e2fa0 arm64: dts: juno: Add thermal critical trip points
b743ecf2 firmware: arm_scmi: Make Rx chan_setup fail on memory errors
29e8e9bf firmware: arm_scmi: Suppress the driver's bind attributes
d7b1e2cb ARM: dts: imx6qdl-gw59{10,13}: fix user pushbutton GPIO offset
160d8904 efi/tpm: Pass correct address to memblock_reserve
c40b4d60 i2c: xiic: Add platform module alias
5bf8c779 drm/amdgpu: set vm_update_mode=0 as default for Sienna Cichlid in SRIOV case
496eb203 HID: saitek: add madcatz variant of MMO7 mouse device ID
ff06067b scsi: core: Restrict legal sdev_state transitions via sysfs
9edf20e5 ACPI: APEI: Fix integer overflow in ghes_estatus_pool_init()
be6e22f5 media: meson: vdec: fix possible refcount leak in vdec_probe()
c5fd54a6 media: dvb-frontends/drxk: initialize err to 0
7fdc58d8 media: cros-ec-cec: limit msg.len to CEC_MAX_MSG_SIZE
1609231f media: s5p_cec: limit msg.len to CEC_MAX_MSG_SIZE
c46759e3 media: rkisp1: Zero v4l2_subdev_format fields in when validating links
3144ce55 media: rkisp1: Initialize color space on resizer sink and source pads
6b24d9c2 s390/boot: add secure boot trailer
efc6420d xhci-pci: Set runtime PM as default policy on all xHC 1.2 or later devices
37bb5790 mtd: parsers: bcm47xxpart: Fix halfblock reads
85e45836 mtd: parsers: bcm47xxpart: print correct offset on read error
ec54104f fbdev: stifb: Fall back to cfb_fillrect() on 32-bit HCRX cards
f8c86d78 video/fbdev/stifb: Implement the stifb_fillrect() function
e975d7ae mmc: sdhci-pci-core: Disable ES for ASUS BIOS on Jasper Lake
afeae13b mmc: sdhci-pci: Avoid comma separated statements
a0672176 mmc: sdhci-esdhc-imx: Propagate ESDHC_FLAG_HS400* only on 8bit bus
59400c9b drm/msm/hdmi: fix IRQ lifetime
8225bdae drm/msm/hdmi: Remove spurious IRQF_ONESHOT flag
5dbb47ee ipv6: fix WARNING in ip6_route_net_exit_late()
1c89642e net, neigh: Fix null-ptr-deref in neigh_table_clear()
634f066d net: mdio: fix undefined behavior in bit shift for __mdiobus_register
d9ec6e2f Bluetooth: L2CAP: fix use-after-free in l2cap_conn_del()
cb1c0120 Bluetooth: L2CAP: Fix use-after-free caused by l2cap_reassemble_sdu
0a0dead4 btrfs: fix ulist leaks in error paths of qgroup self tests
61e06128 btrfs: fix inode list leak during backref walking at find_parent_nodes()
a52e24c7 btrfs: fix inode list leak during backref walking at resolve_indirect_refs()
81204283 isdn: mISDN: netjet: fix wrong check of device registration
e77d2138 mISDN: fix possible memory leak in mISDN_register_device()
f06186e5 rose: Fix NULL pointer dereference in rose_send_frame()
2c8d81bd ipvs: fix WARNING in ip_vs_app_net_cleanup()
931f56d5 ipvs: fix WARNING in __ip_vs_cleanup_batch()
d69328cd ipvs: use explicitly signed chars
b2d7a92a netfilter: nf_tables: release flow rule object from commit path
3583826b net: tun: fix bugs for oversize packet when napi frags enabled
5960b908 net: sched: Fix use after free in red_enqueue()
24f9c414 ata: pata_legacy: fix pdc20230_set_piomode()
c85ee1c3 net: fec: fix improper use of NETDEV_TX_BUSY
52438e73 nfc: nfcmrvl: Fix potential memory leak in nfcmrvl_i2c_nci_send()
0acfcd2a nfc: s3fwrn5: Fix potential memory leak in s3fwrn5_nci_send()
9ae2c9a9 nfc: nxp-nci: Fix potential memory leak in nxp_nci_send()
eecea068 NFC: nxp-nci: remove unnecessary labels
e8c11ee2 nfc: fdp: Fix potential memory leak in fdp_nci_send()
31b83d69 nfc: fdp: drop ftrace-like debugging messages
4e1e4485 RDMA/qedr: clean up work queue on failure in qedr_alloc_resources()
d360e875 RDMA/core: Fix null-ptr-deref in ib_core_cleanup()
37a098fc net: dsa: Fix possible memory leaks in dsa_loop_init()
45aea4fb nfs4: Fix kmemleak when allocate slot failed
f0f1c74f NFSv4.1: We must always send RECLAIM_COMPLETE after a reboot
10c554d7 NFSv4.1: Handle RECLAIM_COMPLETE trunking errors
4813dd73 NFSv4: Fix a potential state reclaim deadlock
7c4260f8 IB/hfi1: Correctly move list in sc_disable()
87ac93c8 RDMA/cma: Use output interface for net_dev check
4dbb739e KVM: x86: Add compat handler for KVM_X86_SET_MSR_FILTER
bb584cae KVM: x86: Copy filter arg outside kvm_vm_ioctl_set_msr_filter()
9faacf44 KVM: x86: Protect the unused bits in MSR exiting flags
5bdbccc7 x86/topology: Fix duplicated core ID within a package
6c31fc02 x86/topology: Fix multiple packages shown on a single-package system
f5ad52da x86/topology: Set cpu_die_id only if DIE_TYPE found
570fa3bc KVM: x86: Treat #DBs from the emulator as fault-like (code and DR7.GD=1)
e5d7c678 KVM: x86: Trace re-injected exceptions
83647861 KVM: nVMX: Don't propagate vmcs12's PERF_GLOBAL_CTRL settings to vmcs02
523e1dd9 KVM: nVMX: Pull KVM L0's desired controls directly from vmcs01
028fcabd serial: ar933x: Deassert Transmit Enable on ->rs485_config()
e6da7808 serial: 8250: Let drivers request full 16550A feature probing

And the following needed .xml update that came from the -lts branch:

type 'struct super_block' changed
  member changed from 'struct key * s_master_keys' to 'struct fscrypt_keyring * s_master_keys'
    type changed from 'struct key *' to 'struct fscrypt_keyring *'
      pointed-to type changed from 'struct key' to 'struct fscrypt_keyring'

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