Hi all,
Changes since 20230718:
The mm tree lost its build failures but gained another for which I
reverted 4 commits.
The bluetooth tree still had its build failure for which I reverted a commit.
Non-merge commits (relative to Linus' tree): 2895
3754 files changed, 103299 insertions(+), 38970 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There is also the merge.log file in the Next
directory. Between each merge, the tree was built with a ppc64_defconfig
for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm
and a native build of tools/perf. After the final fixups (if any), I do
an x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, arm64, s390, sparc and sparc64
defconfig and htmldocs. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 360 trees (counting Linus' and 103 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (ccff6d117d8d Merge tag 'perf-tools-fixes-for-v6.5-1-2023-07-18' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools)
Merging fixes/fixes (d528014517f2 Revert ".gitignore: ignore *.cover and *.mbx")
Merging mm-hotfixes/mm-hotfixes-unstable (73fe72b83957 mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix)
Merging kbuild-current/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3)
Merging arm-current/fixes (2b951b0efbaa ARM: 9297/1: vfp: avoid unbalanced stack on 'success' return path)
Merging arm64-fixes/for-next/fixes (55b87b749963 arm64: Fix HFGxTR_EL2 field naming)
Merging arm-soc-fixes/arm/fixes (6722e46513e0 bus: ixp4xx: fix IXP4XX_EXP_T1_MASK)
Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1)
Merging drivers-memory-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
Merging m68k-current/for-linus (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1)
Merging powerpc-fixes/fixes (ccb381e1af1a powerpc/kasan: Disable KCOV in KASAN code)
Merging s390-fixes/fixes (7686762d1ed0 s390/mm: fix per vma lock fault handling)
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
Merging net/main (8fcd7c7b3a38 octeontx2-pf: Dont allocate BPIDs for LBK interfaces)
Merging bpf/master (8fcd7c7b3a38 octeontx2-pf: Dont allocate BPIDs for LBK interfaces)
Merging ipsec/master (6018a266279b ip_vti: fix potential slab-use-after-free in decode_session6)
Merging netfilter/main (9d0aba98316d gve: unify driver name usage)
Merging ipvs/main (1a7d09a737a0 Merge tag 'nf-23-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
Merging wireless/for-next (f1a0898b5d6a wifi: iwlwifi: mvm: spin_lock_bh() to fix lockdep regression)
Merging wpan/master (9a43827e876c net: dpaa2-mac: add 25gbase-r support)
Merging rdma-fixes/for-rc (29900bf351e1 RDMA/bnxt_re: Fix hang during driver unload)
Merging sound-current/for-linus (c250ef8954ed ALSA: hda/realtek: Add quirk for Clevo NS70AU)
Merging sound-asoc-fixes/for-linus (792f5e8d2001 Merge remote-tracking branch 'asoc/for-6.4' into asoc-linus)
Merging regmap-fixes/for-linus (0c9d2eb5e947 regmap: Account for register length in SMBus I/O limits)
Merging regulator-fixes/for-linus (2423ca6dd7ca Merge remote-tracking branch 'regulator/for-6.4' into regulator-linus)
Merging spi-fixes/for-linus (db5ca3fc2b8c Merge remote-tracking branch 'spi/for-6.4' into spi-linus)
Merging pci-current/for-linus (37540db221e1 MAINTAINERS: Add Manivannan Sadhasivam as DesignWare PCIe driver maintainer)
Merging driver-core.current/driver-core-linus (fdf0eaf11452 Linux 6.5-rc2)
Merging tty.current/tty-linus (fdf0eaf11452 Linux 6.5-rc2)
Merging usb.current/usb-linus (fdf0eaf11452 Linux 6.5-rc2)
Merging usb-serial-fixes/usb-linus (fdf0eaf11452 Linux 6.5-rc2)
Merging phy/fixes (8932089b566c phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code)
Merging staging.current/staging-linus (fdf0eaf11452 Linux 6.5-rc2)
Merging iio-fixes/fixes-togreg (48faabfb3634 dt-bindings: iio: adi,ad74115: remove ref from -nanoamp)
Merging counter-current/counter-current (9b53a1342216 counter: Fix menuconfig "Counter support" submenu entries disappearance)
Merging char-misc.current/char-misc-linus (28f47693a920 Documentation: embargoed-hardware-issues.rst: clean out empty and unused entries)
Merging soundwire-fixes/fixes (7891d0a5ce6f soundwire: amd: Fix a check for errors in probe())
Merging thunderbolt-fixes/fixes (6995e2de6891 Linux 6.4)
Merging input-current/for-linus (eb09074bdb05 Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN)
Merging crypto-current/master (0b7ec177b589 crypto: algif_hash - Fix race between MORE and non-MORE sends)
Merging vfio-fixes/for-linus (4752354af710 vfio/type1: check pfn valid before converting to struct page)
Merging kselftest-fixes/fixes (569f8b501b17 selftests/arm64: fix build failure during the "emit_tests" step)
Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
Merging dmaengine-fixes/fixes (d2a257684758 dmaengine: mcf-edma: Fix a potential un-allocated memory access)
Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2)
Merging mtd-fixes/mtd/fixes (ea690ad78dd6 mtd: rawnand: rockchip: Align hwecc vs. raw page helper layouts)
Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2)
Merging v4l-dvb-fixes/fixes (0cb1d9c84511 media: verisilicon: change confusingly named relaxed register access)
Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref)
Merging mips-fixes/mips-fixes (06c2afb862f9 Linux 6.5-rc1)
Merging at91-fixes/at91-fixes (06c2afb862f9 Linux 6.5-rc1)
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
Merging kvm-fixes/master (2623b3dc875a Merge tag 'kvmarm-fixes-6.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
Merging kvms390-fixes/master (c2fceb59bbda KVM: s390: pv: fix index value of replaced ASCE)
Merging hwmon-fixes/hwmon (a746b3689546 hwmon: (aquacomputer_d5next) Fix incorrect PWM value readout)
Merging nvdimm-fixes/libnvdimm-fixes (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function)
Merging cxl-fixes/fixes (91019b5bc7c2 cxl/acpi: Return 'rc' instead of '0' in cxl_parse_cfmws())
Merging btrfs-fixes/next-fixes (22dd69d1237f Merge branch 'misc-6.5' into next-fixes)
Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor)
Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix)
Merging drivers-x86-fixes/fixes (676b7c5ecab3 platform/x86: serial-multi-instantiate: Auto detect IRQ resource for CSC3551)
Merging samsung-krzk-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging pinctrl-samsung-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging devicetree-fixes/dt/linus (030d2a0ce5dc dt-bindings: hwmon: moortec,mr75203: fix multipleOf for coefficients)
Merging dt-krzk-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging scsi-fixes/fixes (f4d1a8e01190 scsi: storvsc: Handle SRB status value 0x30)
Merging drm-fixes/drm-fixes (fdf0eaf11452 Linux 6.5-rc2)
Merging drm-intel-fixes/for-linux-next-fixes (2c27770a7bc8 Revert "drm/i915: use localized __diag_ignore_all() instead of per file")
Merging mmc-fixes/fixes (5def5c1c15bf mmc: sdhci-f-sdh30: Replace with sdhci_pltfm)
Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
Merging gnss-fixes/gnss-linus (fdf0eaf11452 Linux 6.5-rc2)
Merging hyperv-fixes/hyperv-fixes (55e544e1a922 x86/hyperv: Improve code for referencing hyperv_pcpu_input_arg)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (ab2dbc7acced RISC-V: Don't include Zicsr or Zifencei in I from ACPI)
Merging riscv-dt-fixes/riscv-dt-fixes (06c2afb862f9 Linux 6.5-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (06c2afb862f9 Linux 6.5-rc1)
Merging fpga-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging spdx/spdx-linus (fdf0eaf11452 Linux 6.5-rc2)
Merging gpio-brgl-fixes/gpio/for-current (06c2afb862f9 Linux 6.5-rc1)
Merging gpio-intel-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging pinctrl-intel-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging erofs-fixes/fixes (fdf0eaf11452 Linux 6.5-rc2)
Merging kunit-fixes/kunit-fixes (06c2afb862f9 Linux 6.5-rc1)
Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().")
Merging nfsd-fixes/nfsd-fixes (f75546f58a70 nfsd: Remove incorrect check in nfsd4_validate_stateid)
Merging irqchip-fixes/irq/irqchip-fixes (6fe5c68ee6a1 irqchip/gic-v3: Workaround for GIC-700 erratum 2941627)
Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging perf-current/perf-tools (2480232c61b8 perf test task_exit: No need for a cycles event to check if we get an PERF_RECORD_EXIT)
Merging efi-fixes/urgent (36e4fc57fc16 efi: Bump stub image version for macOS HVF compatibility)
Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert())
Merging battery-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
Merging iommufd-fixes/for-rc (06c2afb862f9 Linux 6.5-rc1)
Merging rust-fixes/rust-fixes (ac9a78681b92 Linux 6.4-rc1)
Merging v9fs-fixes/fixes/next (95f41d878100 fs/9p: Fix a datatype used with V9FS_DIRECT_IO)
Merging w1-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (05abb3be91d8 dma-buf/dma-resv: Stop leaking on krealloc() failure)
Merging mm-stable/mm-stable (06c2afb862f9 Linux 6.5-rc1)
Merging mm-nonmm-stable/mm-nonmm-stable (06c2afb862f9 Linux 6.5-rc1)
Merging mm/mm-everything (2369b6e61b59 Merge branch 'mm-nonmm-unstable' into mm-everything)
Merging kbuild/for-next (3685a5b63db1 kbuild: Enable -Wenum-conversion by default)
Merging clang-format/clang-format (06c2afb862f9 Linux 6.5-rc1)
Merging perf/perf-tools-next (bcd981db12e6 perf test: Fix event parsing test when PERF_PMU_CAP_EXTENDED_HW_TYPE isn't supported.)
Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2)
Merging dma-mapping/for-next (8ac04063354a swiotlb: reduce the number of areas to match actual memory pool size)
Merging asm-generic/master (4dd595c34c4b syscalls: Remove file path comments from headers)
Merging arc/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging arm/for-next (1faf70485ea9 Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (893b24181b4c arm64: sme: Use STR P to clear FFR context field in streaming SVE mode)
Merging arm-perf/for-next/perf (dea0f4146f66 docs: perf: Fix warning from 'make htmldocs' in hisi-pmu.rst)
Merging arm-soc/for-next (6722e46513e0 bus: ixp4xx: fix IXP4XX_EXP_T1_MASK)
Merging amlogic/for-next (76483eaf2109 Merge branch 'v6.6/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX)
Merging aspeed/for-next (a43f3e970a1d ARM: dts: aspeed: Add AST2600 VUARTs)
Merging at91/at91-next (c2c1686e25be Merge branches 'at91-soc' and 'at91-dt' into at91-next)
Merging broadcom/next (0d8d8753ede0 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging drivers-memory/for-next (b71da9105a81 dt-bindings: net: davicom,dm9000: convert to DT schema)
Merging imx-mxs/for-next (31d9c5a7363e Merge branch 'imx/defconfig' into for-next)
Merging mediatek/for-next (f6925844c82a Merge branch 'v6.4-next/soc' into for-next)
Merging mvebu/for-next (54fbc0260c64 Merge branch 'mvebu/drivers' into mvebu/for-next)
Merging omap/for-next (f581c395fcb8 Merge branches 'omap-for-v6.5/ti-sysc' and 'omap-for-v6.5/cleanup' into for-next)
Merging qcom/for-next (a3066b67f2ea Merge branches 'arm64-defconfig-for-6.6', 'arm64-fixes-for-6.5', 'arm64-for-6.6', 'clk-for-6.6', 'drivers-for-6.6' and 'dts-for-6.6' into for-next)
Merging renesas/next (d04ad80865d1 Merge branch 'renesas-dts-for-v6.6' into renesas-next)
Merging reset/reset/next (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS)
Merging rockchip/for-next (256b22ad54be Merge branch 'v6.6-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (a291cd9aa89b Merge branch 'next/dt' into for-next)
Merging scmi/for-linux-next (48d032e50bc0 Merge branches 'for-next/juno/fixes', 'for-next/juno/updates', 'for-next/vexpress/updates' and 'for-next/scmi/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (2f38de940f07 ARM: dts: stm32: Add missing detach mailbox for DHCOR SoM)
Merging sunxi/sunxi/for-next (1bcb932283c9 Merge branch 'sunxi/dt-for-6.5' into sunxi/for-next)
Merging tee/next (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy)
Merging tegra/for-next (e6a235bdf712 Merge branch for-6.6/arm64/dt into for-next)
Merging ti/ti-next (18a70fe4eff4 Merge branch 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (6008eee2c754 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (06c2afb862f9 Linux 6.5-rc1)
Merging clk-imx/for-next (878b02d5f3b5 clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe())
Merging clk-renesas/renesas-clk (bbceb13ce2c7 clk: renesas: rzg2l: Simplify .determine_rate())
Merging csky/linux-next (6ee1ffdc1838 csky: pgtable: Fixup update_mmu_cache for abiv2)
Merging loongarch/loongarch-next (c2296cc3968f LoongArch: Add kernel address sanitizer support)
Merging m68k/for-next (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1)
Merging m68knommu/for-next (fdf0eaf11452 Linux 6.5-rc2)
Merging microblaze/next (0e9a2a228a1a microblaze: Explicitly include correct DT includes)
Merging mips/mips-next (06c2afb862f9 Linux 6.5-rc1)
Merging openrisc/for-next (dceaafd66881 openrisc: Union fpcsr and oldmask in sigcontext to unbreak userspace ABI)
Merging parisc-hd/for-next (6995e2de6891 Linux 6.4)
Merging powerpc/next (fdf0eaf11452 Linux 6.5-rc2)
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (471aba2e4760 riscv: sigcontext: Correct the comment of sigreturn)
Merging riscv-dt/riscv-dt-for-next (ef6012f301f7 riscv: dts: Enable device-tree overlay support for starfive devices)
Merging riscv-soc/riscv-soc-for-next (1fcaaa1d489c riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE)
Merging s390/for-next (e1aa0e3f9c07 Merge branch 'fixes' into for-next)
Merging sh/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable)
Merging xtensa/xtensa-for-next (a160e9414d8a xtensa: fix unaligned and load/store configuration interaction)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (324718ddddc4 fscrypt: improve the "Encryption modes and usage" section)
Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums)
Merging btrfs/for-next (9891dbeee08d Merge branch 'for-next-next-v6.5-20230718' into for-next-20230718)
Merging ceph/master (a282a2f10539 libceph: harden msgr2.1 frame segment length checks)
Merging cifs/for-next (4969cfb4f68d smb: add missing create options for O_DIRECT and O_SYNC flags)
Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items)
Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
Merging erofs/dev (06c2afb862f9 Linux 6.5-rc1)
Merging exfat/dev (ff84772fd45d exfat: release s_lock before calling dir_emit())
Merging ext3/for_next (eccf9ae28312 Pull patch forbiding superblock / mount marks on internal kernel mounts.)
Merging ext4/dev (7c79210b15ef ext4: fix off by one issue in ext4_mb_choose_next_group_best_avail())
Merging f2fs/dev (10c7134ee440 f2fs: compress: don't {,de}compress non-full cluster)
Merging fsverity/for-next (456ae5fe9b44 fsverity: move sysctl registration out of signature.c)
Merging fuse/for-next (6a567e920fd0 fuse: ioctl: translate ENOSYS in outarg)
Merging gfs2/for-next (c6fa6b6c07c8 gfs2: increase usage of folio_next_index() helper)
Merging jfs/jfs-next (6e2bda2c192d jfs: fix invalid free of JFS_IP(ipimap)->i_imap in diUnmount)
Merging ksmbd/ksmbd-for-next (956cd69868ee ksmbd: check if a mount point is crossed during path lookup)
Merging nfs/linux-next (5b4a82a0724a Revert "NFSv4: Retry LOCK on OLD_STATEID during delegation return")
Merging nfs-anna/linux-next (43439d858bba NFSv4.2: Fix a potential double free with READ_PLUS)
Merging nfsd/nfsd-next (8f738869ffd2 SUNRPC: Use a per-transport receive bio_vec array)
Merging ntfs3/master (44b4494d5c59 fs/ntfs3: Correct mode for label entry inside /proc/fs/ntfs3/)
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
Merging overlayfs/overlayfs-next (0a3bf81dbcb2 ovl: auto generate uuid for new overlay filesystems)
Merging ubifs/next (b5fda08ef213 ubifs: Fix memleak when insert_old_idx() failed)
Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7)
Merging v9fs-ericvh/ericvh/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging xfs/for-next (f6250e205691 xfs: convert flex-array declarations in xfs attr shortform objects)
Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
Merging iomap/iomap-for-next (efa96cc99793 iomap: micro optimize the ki_pos assignment in iomap_file_buffered_write)
Merging djw-vfs/vfs-for-next (59ba4fdd2d1f fs: wait for partially frozen filesystems)
Merging file-locks/locks-next (0d6aeec73f8c selftests: add OFD lock tests)
Merging iversion/iversion-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()')
Merging vfs-brauner/vfs.all (c62e19541f8b Merge branches 'vfs.readdir', 'vfs.misc', 'vfs.ctime', 'vfs.fchmodat2' and 'fs.proc.uapi' into vfs.all)
Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next)
Merging printk/for-next (8ca06365afc4 Merge branch 'for-6.6-vsprintf-doc' into for-next)
Merging pci/next (ffb9381f49da Merge branch 'pci/misc')
Merging pstore/for-next/pstore (438b805003a0 pstore: Replace crypto API compression with zlib_deflate library calls)
Merging hid/for-next (5eb5c80feb93 Merge branch 'for-6.5/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (6537ed3904a3 i2c: mpc: Drop unused variable)
Merging i3c/i3c/next (49b472ebc61d i3c: master: svc: add NACK check after start byte sent)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
Merging hwmon-staging/hwmon-next (96256c7ab556 hwmon: (nct6775) Increase and reorder ALARM/BEEP bits)
Merging jc_docs/docs-next (67b3f564cb1e time: add kernel-doc in time.c)
Merging v4l-dvb/master (06c2afb862f9 Linux 6.5-rc1)
Merging v4l-dvb-next/master (d7b13edd4cb4 media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link())
Merging pm/linux-next (6e9908abf1d1 Merge branch 'acpi-processor' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (9d4807ffe9ef cpufreq: omap: Convert to platform remove callback returning void)
Merging cpupower/cpupower (99481d2195bf cpupower: Fix cpuidle_set to accept only numeric values for idle-set operation.)
Merging devfreq/devfreq-next (a83bfdca8b20 PM / devfreq: mtk-cci: Fix variable deferencing before NULL check)
Merging opp/opp/linux-next (06c2afb862f9 Linux 6.5-rc1)
Merging thermal/thermal/linux-next (57c9eaa4de53 thermal/drivers/qcom/temp-alarm: Use dev_err_probe)
Merging dlm/next (fc4ea4229c2b fs: dlm: remove filter local comms on close)
Merging rdma/for-next (f877f22ac1e9 RDMA/irdma: Implement egress VLAN priority)
Merging net-next/main (4a59cdfd6699 rtnetlink: Move nesting cancellation rollback to proper function)
Merging bpf-next/for-next (60cc1f7d0605 Merge branch 'phy-at803x-support')
Merging ipsec-next/master (a94fd40a18ae xfrm: delete not-needed clear to zero of encap_oa)
Merging mlx5-next/mlx5-next (77f7eb9f3416 net/mlx5: Introduce other vport query for Q-counters)
Merging netfilter-next/main (b8e39b38487e netlink: Make use of __assign_bit() API)
Merging ipvs-next/main (61dc651cdfe8 Merge tag 'nf-next-23-06-26' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next)
Merging bluetooth/master (75401514ef1b Bluetooth: MGMT: Use correct address for memcpy())
Applying: Revert "Bluetooth: hci_sock: Forward credentials to monitor"
Merging wireless-next/for-next (31b5a547622b wifi: ieee80211: fix erroneous NSTR bitmap size checks)
Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
Merging mtd/mtd/next (de2a5d52f2c0 dt-bindings: mtd: Add SEAMA partition bindings)
Merging nand/nand/next (c3519aed2a3f dt-bindings: nand: meson: support for 512B ECC step size)
Merging spi-nor/spi-nor/next (d4996700abc1 mtd: spi-nor: rename method for enabling or disabling octal DTR)
Merging crypto/master (635e4674e184 crypto: hisilicon/hpre - ensure private key less than n)
Merging drm/drm-next (6c7f27441d6a Merge tag 'drm-misc-next-2023-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging drm-misc/for-linux-next (41639b3a8b0f drm/bridge: anx7625: Use common macros for HDCP capabilities)
Merging amdgpu/drm-next (18cf073faaa9 drm/amdgpu: use a macro to define no xcp partition case)
Merging drm-intel/for-linux-next (c5741c5c1122 drm/i915/display: Do not use stolen on MTL)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power_well.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_gem_device.c
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (cd036d542afb drm/msm/a6xx: Add A610 speedbin support)
Merging drm-msm-lumag/msm-next-lumag (1275b21a6c54 drm/msm/dsi: Enable BURST_MODE for command mode for DSI 6G v1.3+)
Merging etnaviv/etnaviv/next (9ec2afde83c1 drm/etnaviv: expedited MMU fault handling)
Merging fbdev/for-next (53a90ae81a33 fbdev: imxfb: remove unneeded labels)
Merging regmap/for-next (a563d12d1008 Merge remote-tracking branch 'regmap/for-6.6' into regmap-next)
Merging sound/for-next (21634f0f307c Merge branch 'topic/hda-pci-ids' into for-next)
Merging ieee1394/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging sound-asoc/for-next (e5bfd531cc60 Merge remote-tracking branch 'asoc/for-6.6' into asoc-next)
Merging modules/modules-next (9ce170cef669 kernel: params: Remove unnecessary ‘0’ values from err)
Merging input/next (904ef2c47d8f Input: gpio-keys - convert to dev_err_probe())
Merging block/for-next (00174f7b0d30 Merge branch 'for-6.6/block' into for-next)
Merging device-mapper/for-next (7aa303bf1bd2 dm raid: protect md_stop() with 'reconfig_mutex')
Merging libata/for-next (5cff2dbd980d ata: pata_imx: Use devm_platform_get_and_ioremap_resource())
Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
Merging mmc/next (e8e2c7b0e695 mmc: davinci: Make SDIO irq truly optional)
Merging mfd/for-mfd-next (b90e33b6116a mfd: wm8998: Update to use maple tree register cache)
Merging backlight/for-backlight-next (a33677b9211b backlight: led_bl: Take led_access lock when required)
Merging battery/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging regulator/for-next (234d1e10bcf0 Merge remote-tracking branch 'regulator/for-6.6' into regulator-next)
Merging security/next (c31288e56c1a evm: Support multiple LSMs providing an xattr)
Merging apparmor/apparmor-next (afad53575a93 apparmor: use passed in gfp flags in aa_alloc_null())
Merging integrity/next-integrity (95526d13038c ima: Fix build warnings)
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
Merging selinux/next (90aa4f5e92f2 selinux: de-brand SELinux)
Merging smack/next (2c085f3a8f23 smack: Record transmuting in smk_transmuted)
Merging tomoyo/master (fdf0eaf11452 Linux 6.5-rc2)
Merging tpmdd/next (8447ac1ca47b tpm: Switch i2c drivers back to use .probe())
Merging watchdog/master (fdf0eaf11452 Linux 6.5-rc2)
Merging iommu/next (a5003e75a171 Merge branches 'iommu/fixes', 'arm/rockchip', 'x86/amd' and 'core' into next)
Merging audit/next (06c2afb862f9 Linux 6.5-rc1)
Merging devicetree/for-next (1f5ce01d5d71 dt-bindings: crypto: qcom-qce: add SoC compatible string for ipq9574)
Merging dt-krzk/for-next (1193001081e9 arm64: dts: lg: add missing cache properties)
Merging mailbox/mailbox-for-next (1b712f18c461 mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0)
Merging spi/for-next (55a1cfa1ce01 Merge remote-tracking branch 'spi/for-6.6' into spi-next)
Merging tip/master (e209b9496e10 Merge branch into tip/master: 'x86/mm')
Merging clockevents/timers/drivers/next (8b5bf64c89c7 clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe)
Merging edac/edac-for-next (852667c317ae Merge ras/edac-drivers into for-next)
Merging irqchip/irq/irqchip-next (a82f3119d543 Merge branch irq/misc-6.5 into irq/irqchip-next)
Merging ftrace/for-next (61c692f56fec Merge tools/for-next)
Merging rcu/rcu/next (ddf5d3eda2df Merge branch 'csd-lock.2023.07.14b' into HEAD)
Merging kvm/next (255006adb3da Merge tag 'kvm-x86-vmx-6.5' of https://github.com/kvm-x86/linux into HEAD)
Merging kvm-arm/next (192df2aa0113 KVM: arm64: Fix misuse of KVM_ARM_VCPU_POWER_OFF bit index)
Merging kvms390/next (db54dfc9f71c s390/uv: Update query for secret-UVCs)
Merging kvm-riscv/riscv_kvm_next (07f225b58424 RISC-V: KVM: Remove unneeded semicolon)
Merging kvm-x86/next (fdf0eaf11452 Linux 6.5-rc2)
Merging xen-tip/linux-next (fdf0eaf11452 Linux 6.5-rc2)
Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next)
Merging workqueues/for-next (6dc917b44525 Merge branch 'for-6.5-fixes' into for-next)
Merging drivers-x86/for-next (9204fc5071bf platform/x86: hp-bioscfg: MAINTAINERS)
Merging chrome-platform/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging hsi/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging leds-lj/for-leds-next (7a2b85a76b05 leds: simatic-ipc-leds-gpio: Fix comment style in SPDX header)
Merging ipmi/for-next (b02bb79eee07 ipmi: fix potential deadlock on &kcs_bmc->lock)
Merging driver-core/driver-core-next (fdf0eaf11452 Linux 6.5-rc2)
Merging usb/usb-next (fdf0eaf11452 Linux 6.5-rc2)
Merging thunderbolt/next (481012b479fe thunderbolt: Add test case for 3 DisplayPort tunnels)
Merging usb-serial/usb-next (fdf0eaf11452 Linux 6.5-rc2)
Merging tty/tty-next (fdf0eaf11452 Linux 6.5-rc2)
Merging char-misc/char-misc-next (fdf0eaf11452 Linux 6.5-rc2)
Merging accel/habanalabs-next (e6f49e96bc57 accel/habanalabs: refactor error info reset)
Merging coresight/next (6c50384ef8b9 hwtracing: hisi_ptt: Fix potential sleep in atomic context)
Merging fastrpc/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging fpga/for-next (840208392d3d fpga: Explicitly include correct DT includes)
Merging icc/icc-next (768c42cd9acb Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (d9b431026523 dt-bindings: iio: adc: qcom,spmi-adc7: use predefined channel ids)
Merging phy-next/next (f66782cff479 dt-bindings: phy: rockchip: add RK3588 PCIe v3 phy)
Merging soundwire/next (3f92da3ea448 soundwire: Explicitly include correct DT includes)
Merging extcon/extcon-next (94da3da96c35 dt-bindings: extcon: wlf,arizona: drop unneeded quotes)
Merging gnss/gnss-next (fdf0eaf11452 Linux 6.5-rc2)
Merging vfio/next (ff598081e5b9 vfio/mdev: Move the compat_class initialization to module init)
Merging w1/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging staging/staging-next (fdf0eaf11452 Linux 6.5-rc2)
Merging counter-next/counter-next (9b53a1342216 counter: Fix menuconfig "Counter support" submenu entries disappearance)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (1b13e52c0c76 dmaengine: xilinx: dma: remove arch dependency)
Merging cgroup/for-next (32bf85c60ca3 cgroup/misc: Change counters to be explicit 64bit types)
CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/.gitignore
CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/Makefile
Applying: Revert "cgroup: put cgroup_tryget_css() inside CONFIG_CGROUP_SCHED"
Merging scsi/for-next (f4d1a8e01190 scsi: storvsc: Handle SRB status value 0x30)
Merging scsi-mkp/for-next (e152a616c886 scsi: ufs: ufs-mediatek: Add MCQ support for MTK platform)
Merging vhost/linux-next (373abdba01d4 vdpa_sim: offer VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging rpmsg/for-next (3b758b6b1b90 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging gpio-brgl/gpio/for-next (55b2395e4e92 gpio: mmio: handle "ngpios" properly in bgpio_init())
Merging gpio-intel/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging pinctrl/for-next (7a69e63d0d9b dt-bindings: pinctrl: amlogic,meson-pinctrl-common: allow gpio hogs)
Merging pinctrl-intel/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging pinctrl-renesas/renesas-pinctrl (bf8da305fef9 pinctrl: renesas: rzv2m: Use devm_clk_get_enabled())
Merging pinctrl-samsung/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging pwm/for-next (92554cdd428f dt-bindings: pwm: convert pwm-bcm2835 bindings to YAML)
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
Merging kselftest/next (feac01aaf677 selftests: prctl: Add new prctl test for PR_SET_NAME)
Merging kunit/test (06c2afb862f9 Linux 6.5-rc1)
Merging kunit-next/kunit (7bd2b8465b50 MAINTAINERS: add Rust KUnit files to the KUnit entry)
Merging livepatching/for-next (ac4890f97211 Merge branch 'for-6.5/core' into for-next)
Merging rtc/rtc-next (1b733a9ebc3d rtc: Add rtc driver for the Loongson family chips)
Merging nvdimm/libnvdimm-for-next (1ea7ca1b0901 dax: enable dax fault handler to report VM_FAULT_HWPOISON)
Merging at24/at24/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging ntb/ntb-next (994def29acc5 ntb: Remove error checking for debugfs_create_dir())
Merging seccomp/for-next/seccomp (7d5cb68af638 perf/benchmark: add a new benchmark for seccom_unotify)
Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get)
Merging slimbus/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging nvmem/for-next (8fd85ce6cfdf dt-bindings: nvmem: qfprom: Add compatible for MSM8226)
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
Merging hyperv/hyperv-next (a494aef23dfc PCI: hv: Replace retarget_msi_interrupt_params with hyperv_pcpu_input_arg)
Merging auxdisplay/auxdisplay (def85dce1451 auxdisplay: Switch i2c drivers back to use .probe())
Merging kgdb/kgdb/for-next (b6464883f45a kdb: move kdb_send_sig() declaration to a better header file)
Merging hmm/hmm (06c2afb862f9 Linux 6.5-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (d0184830e611 bus: mhi: host: use vmalloc_array and vcalloc)
Merging memblock/for-next (0f5e4adb608c memblock: report failures when memblock_can_resize is not set)
Merging cxl/next (fe77cc2e5a6a cxl: Fix one kernel-doc comment)
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
Merging efi/next (2e28a798c309 efi/libstub: Disable PCI DMA before grabbing the EFI memory map)
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (66489e5487b7 Merge branch 'slab/for-6.6/random_kmalloc' into slab/for-next)
Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging landlock/next (35ca42399297 selftests/landlock: Add hostfs tests)
Merging rust/rust-next (d2e3115d7171 rust: error: `impl Debug` for `Error` with `errname()` integration)
Merging sysctl/sysctl-next (06c2afb862f9 Linux 6.5-rc1)
Merging execve/for-next/execve (fdf0eaf11452 Linux 6.5-rc2)
Merging bitmap/bitmap-for-next (94b154766896 lib: test for_each_numa_cpus())
Merging hte/for-next (ac9a78681b92 Linux 6.4-rc1)
Merging kspp/for-next/kspp (c30417b20f49 seq_file: Replace strncpy()+nul by strscpy())
Merging kspp-gustavo/for-next/kspp (6ae3f51825e3 fs: omfs: Use flexible-array member in struct omfs_extent)
Merging iommufd/for-next (06c2afb862f9 Linux 6.5-rc1)
Applying: Revert "mmu_notifiers: don't invalidate secondary TLBs as part of mmu_notifier_invalidate_range_end()"
Applying: Revert "mmu_notifiers: call arch_invalidate_secondary_tlbs() when invalidating TLBs"
Applying: Revert "arm64/smmu: use TLBI ASID when invalidating entire range"
Applying: Revert "mm_notifiers: rename invalidate_range notifier"