CHROMIUM: Merge 'v6.1.119' into chromeos-6.1
Merge of v6.1.119 into chromeos-6.1
Conflicts:
net/bluetooth/hci_event.c
Changelog:
----------------------------------------------------------------
Alexandre Ferrieux (1):
net: sched: cls_u32: Fix u32's systematic failure to free IDR entries for hnodes.
Andre Przywara (1):
mmc: sunxi-mmc: Fix A100 compatible description
Andrew Morton (1):
mm: revert "mm: shmem: fix data-race in shmem_getattr()"
Andy Yan (1):
drm/rockchip: vop: Fix a dereferenced before check warning
Aurelien Jarno (1):
Revert "mmc: dw_mmc: Fix IDMAC operation with pages bigger than 4K"
Baoquan He (1):
x86/mm: Fix a kdump kernel failure on SME system when CONFIG_IMA_KEXEC=y
Chen Hanxiao (1):
ipvs: properly dereference pe in ip_vs_add_service
Christophe JAILLET (1):
null_blk: Remove usage of the deprecated ida_simple_xx() API
Chuck Lever (4):
NFSD: Async COPY result needs to return a write verifier
NFSD: Limit the number of concurrent async COPY operations
NFSD: Initialize struct nfsd4_copy earlier
NFSD: Never decrement pending_async_copies on error
Dai Ngo (1):
NFSD: initialize copy->cp_clp early in nfsd4_copy for use by trace point
Damien Le Moal (1):
null_blk: Fix return value of nullb_device_power_store()
Dan Carpenter (1):
cxl/pci: fix error code in __cxl_hdm_decode_init()
Divya Chauhan (1):
Merge remote-tracking branch 'cros/stable-merge/linux/v6.1.119' into merge/chromeos-6.1-v6.1.119
Dmitry Antipov (2):
ocfs2: uncache inode which has failed entering the group
ocfs2: fix UBSAN warning in ocfs2_verify_volume()
Dragos Tatulea (1):
net/mlx5e: kTLS, Fix incorrect page refcounting
Eli Billauer (2):
char: xillybus: Prevent use-after-free due to race condition
char: xillybus: Fix trivial bug with mutex
Eric Dumazet (2):
net: add copy_safe_from_sockptr() helper
nfc: llcp: fix nfc_llcp_setsockopt() unsafe copies
Eric Van Hensbergen (1):
fs/9p: fix uninitialized values during inode evict
Francesco Dolcini (1):
drm/bridge: tc358768: Fix DSI command tx
Geliang Tang (5):
mptcp: define more local variables sk
mptcp: add userspace_pm_lookup_addr_by_id helper
mptcp: update local address flags when setting it
mptcp: hold pm lock when deleting entry
mptcp: drop lookup_by_id in lookup_addr
Greg Kroah-Hartman (1):
Linux 6.1.119
Hangbin Liu (1):
bonding: add ns target multicast address to slave device
Harith G (1):
ARM: 9419/1: mm: Fix kernel memory mapping for xip kernels
Jakub Kicinski (1):
netlink: terminate outstanding dump on socket close
Jinjiang Tu (1):
mm: fix NULL pointer dereference in alloc_pages_bulk_noprof
Jiri Olsa (1):
lib/buildid: Fix build ID parsing logic
Kailang Yang (1):
ALSA: hda/realtek - Fixed Clevo platform headset Mic issue
Konstantin Komarov (1):
fs/ntfs3: Additional check in ntfs_file_release
Lin.Cao (1):
drm/amd: check num of link levels when update pcie param
Lorenzo Stoakes (4):
mm: avoid unsafe VMA hook invocation when error arises on mmap hook
mm: unconditionally close VMAs on error
mm: refactor arch_calc_vm_flag_bits() and arm64 MTE handling
mm: resolve faulty mmap_region() error path behaviour
Luiz Augusto von Dentz (2):
Bluetooth: hci_core: Fix calling mgmt_device_connected
Bluetooth: ISO: Fix not validating setsockopt user input
Lukas Bulwahn (1):
Bluetooth: hci_event: Remove code to removed CONFIG_BT_HS
Maksym Glubokiy (1):
ALSA: hda/realtek: fix mute/micmute LEDs for a HP EliteBook 645 G10
Mark Bloch (1):
net/mlx5: fs, lock FTE when checking if active
Matthieu Baerts (NGI0) (1):
mptcp: pm: use _rcu variant under rcu_read_lock
Mauro Carvalho Chehab (1):
media: dvbdev: fix the logic when DVB_DYNAMIC_MINORS is not set
Michal Luczaj (2):
virtio/vsock: Fix accept_queue memory leak
net: Make copy_safe_from_sockptr() match documentation
Mikulas Patocka (1):
parisc: fix a possible DMA corruption
Moshe Shemesh (1):
net/mlx5e: CT: Fix null-ptr-deref in add rule err flow
Namjae Jeon (2):
ksmbd: fix slab-out-of-bounds in smb_strndup_from_utf16()
ksmbd: fix potencial out-of-bounds when buffer offset is invalid
Paolo Abeni (2):
mptcp: error out earlier on disconnect
mptcp: cope racing subflow creation in mptcp_rcv_space_adjust
Pedro Tammela (1):
net/sched: cls_u32: replace int refcounts with proper refcounts
Ryusuke Konishi (2):
nilfs2: fix null-ptr-deref in block_touch_buffer tracepoint
nilfs2: fix null-ptr-deref in block_dirty_buffer tracepoint
Samasth Norway Ananda (1):
ima: fix buffer overrun in ima_eventdigest_init_common
Sean Christopherson (3):
KVM: nVMX: Treat vpid01 as current if L2 is active, but with VPID disabled
KVM: x86: Unconditionally set irr_pending when updating APICv state
KVM: VMX: Bury Intel PT virtualization (guest/host mode) behind CONFIG_BROKEN
Si-Wei Liu (1):
vdpa/mlx5: Fix PA offset with unaligned starting iotlb map
Stefan Wahren (2):
net: vertexcom: mse102x: Fix tx_bytes calculation
staging: vchiq_arm: Get the rid off struct vchiq_2835_state
Umang Jain (1):
staging: vchiq_arm: Use devm_kzalloc() for vchiq_arm_state allocation
Vijendar Mukunda (1):
drm/amd: Fix initialization mistake for NBIO 7.7.0
Vladimir Oltean (1):
net/sched: taprio: extend minimum interval restriction to entire cycle too
Wei Fang (2):
samples: pktgen: correct dev to DEV
net: fec: remove .ndo_poll_controller to avoid deadlocks
Xiaoguang Wang (1):
vp_vdpa: fix id_table array not null terminated error
Yu Kuai (1):
null_blk: fix null-ptr-dereference while configuring 'power' and 'submit_queues'
Makefile | 2 +-
arch/arm/kernel/head.S | 8 +-
arch/arm/mm/mmu.c | 34 +++--
arch/arm64/include/asm/mman.h | 10 +-
arch/parisc/Kconfig | 1 +
arch/parisc/include/asm/cache.h | 11 +-
arch/x86/kvm/lapic.c | 29 ++--
arch/x86/kvm/vmx/nested.c | 30 +++-
arch/x86/kvm/vmx/vmx.c | 6 +-
arch/x86/mm/ioremap.c | 6 +-
drivers/block/null_blk/main.c | 45 ++++--
drivers/char/xillybus/xillybus_class.c | 7 +-
drivers/char/xillybus/xillyusb.c | 22 ++-
drivers/cxl/core/pci.c | 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 6 +
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 +
drivers/gpu/drm/bridge/tc358768.c | 21 ++-
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +-
drivers/media/dvb-core/dvbdev.c | 15 +-
drivers/mmc/host/dw_mmc.c | 4 +-
drivers/mmc/host/sunxi-mmc.c | 6 +-
drivers/net/bonding/bond_main.c | 16 +-
drivers/net/bonding/bond_options.c | 82 ++++++++++-
drivers/net/ethernet/freescale/fec_main.c | 26 ----
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 2 +-
.../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 8 +-
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 15 +-
drivers/net/ethernet/vertexcom/mse102x.c | 4 +-
.../vc04_services/interface/vchiq_arm/vchiq_arm.c | 25 +---
drivers/vdpa/mlx5/core/mr.c | 8 +-
drivers/vdpa/virtio_pci/vp_vdpa.c | 10 +-
fs/9p/vfs_inode.c | 23 +--
fs/nfsd/netns.h | 1 +
fs/nfsd/nfs4proc.c | 34 ++---
fs/nfsd/nfs4state.c | 1 +
fs/nfsd/xdr4.h | 1 +
fs/nilfs2/btnode.c | 2 -
fs/nilfs2/gcinode.c | 4 +-
fs/nilfs2/mdt.c | 1 -
fs/nilfs2/page.c | 2 +-
fs/ntfs3/file.c | 12 +-
fs/ocfs2/resize.c | 2 +
fs/ocfs2/super.c | 13 +-
fs/smb/server/smb2misc.c | 26 +++-
fs/smb/server/smb2pdu.c | 48 +++---
include/linux/mman.h | 7 +-
include/linux/sockptr.h | 27 ++++
include/net/bond_options.h | 2 +
lib/buildid.c | 2 +-
mm/internal.h | 19 +++
mm/mmap.c | 120 ++++++++-------
mm/nommu.c | 9 +-
mm/page_alloc.c | 3 +-
mm/shmem.c | 5 -
mm/util.c | 33 +++++
net/bluetooth/hci_core.c | 2 -
net/bluetooth/hci_event.c | 163 ---------------------
net/bluetooth/iso.c | 32 ++--
net/mptcp/pm_netlink.c | 15 +-
net/mptcp/pm_userspace.c | 77 ++++++----
net/mptcp/protocol.c | 16 +-
net/netfilter/ipvs/ip_vs_ctl.c | 10 +-
net/netlink/af_netlink.c | 31 +---
net/netlink/af_netlink.h | 2 -
net/nfc/llcp_sock.c | 12 +-
net/sched/cls_u32.c | 54 ++++---
net/sched/sch_taprio.c | 10 +-
net/vmw_vsock/virtio_transport_common.c | 8 +
samples/pktgen/pktgen_sample01_simple.sh | 2 +-
security/integrity/ima/ima_template_lib.c | 14 +-
sound/pci/hda/patch_realtek.c | 3 +
.../tc-testing/tc-tests/qdiscs/taprio.json | 22 +++
72 files changed, 759 insertions(+), 583 deletions(-)
BUG=b:380434010
TEST=Build and test on various affected systems
Change-Id: I0c85a76670e4e7060d7ee4781b77b21c5966f9f0
Disallow-Recycled-Builds: test-failures
Signed-off-by: Divya Chauhan <chauhandivya@google.com>
