Hi all, Changes since 20230713: The vfs-brauner tree gained conflicts against the mm tree. The pm tree gained a build failure so I used the version from next-20230713. The bluetooth tree still had its build failure for which I reverted a commit. Non-merge commits (relative to Linus' tree): 2101 ---------------------------------------------------------------------------- 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 (4b810bf037e5 Merge tag 'erofs-for-6.5-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs) Merging fixes/fixes (d528014517f2 Revert ".gitignore: ignore *.cover and *.mbx") Merging mm-hotfixes/mm-hotfixes-unstable (46575249388f 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 (cf53564b11ce powerpc/mm/book3s64/hash/4k: Add pmd_same callback for 4K page size) Merging s390-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) 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 (9d23aac8a85f Merge branch 'net-sched-fixes-for-sch_qfq') Merging bpf/master (2e06c57d66d3 xdp: use trusted arguments in XDP hints kfuncs) Merging ipsec/master (57010b8ece28 xfrm: Silence warnings triggerable by bad packets) 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 (06c2afb862f9 Linux 6.5-rc1) Merging sound-current/for-linus (645e583d2689 selftests: ALSA: Fix fclose on an already fclosed file pointer) Merging sound-asoc-fixes/for-linus (a3e64c2b2c65 Merge remote-tracking branch 'asoc/for-6.4' into asoc-linus) Merging regmap-fixes/for-linus (963b54df82b6 regmap-irq: Fix out-of-bounds access when allocating config buffers) Merging regulator-fixes/for-linus (31e112d5bb1c Merge remote-tracking branch 'regulator/for-6.4' into regulator-linus) Merging spi-fixes/for-linus (f481dd5886fa 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 (06c2afb862f9 Linux 6.5-rc1) Merging tty.current/tty-linus (06c2afb862f9 Linux 6.5-rc1) Merging usb.current/usb-linus (06c2afb862f9 Linux 6.5-rc1) Merging usb-serial-fixes/usb-linus (06c2afb862f9 Linux 6.5-rc1) Merging phy/fixes (8932089b566c phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code) Merging staging.current/staging-linus (06c2afb862f9 Linux 6.5-rc1) Merging iio-fixes/fixes-togreg (3af5d5b9a262 iio: adc: ina2xx: avoid NULL pointer dereference on OF device match) Merging counter-current/counter-current (9b53a1342216 counter: Fix menuconfig "Counter support" submenu entries disappearance) Merging char-misc.current/char-misc-linus (06c2afb862f9 Linux 6.5-rc1) 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 (b33b8731566d selftests/mincore: fix skip condition for check_huge_pages test) 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 (7e6b04f9238e mtd: rawnand: meson: fix OOB available bytes for ECC) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (f2702d8e53d8 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 (21f27df85400 KVM: s390: pv: fix external interruption loop not always detected) Merging hwmon-fixes/hwmon (b153a0bb4199 hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272) Merging nvdimm-fixes/libnvdimm-fixes (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function) Merging cxl-fixes/fixes (a70fc4ed20a6 cxl/port: Fix NULL pointer access in devm_cxl_add_port()) Merging btrfs-fixes/next-fixes (a14ea7d5b756 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 (6b293a8c91bc platform/x86: touchscreen_dmi: Add info for the Archos 101 Cesium Educ tablet) 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 (0bb8f49cd2cc of: Preserve "of-display" device name for compatibility) 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 (06c2afb862f9 Linux 6.5-rc1) Merging drm-intel-fixes/for-linux-next-fixes (113899c2669d drm/i915: Fix one wrong caching mode enum usage) Merging mmc-fixes/fixes (d44263222134 mmc: moxart: read scr register without changing byte order) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (06c2afb862f9 Linux 6.5-rc1) 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 (b690e266dae2 riscv: mm: fix truncation warning on RV32) 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 (06c2afb862f9 Linux 6.5-rc1) 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 (18bddc5b6703 erofs: fix fsdax unavailability for chunk-based regular files) 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 (d7dbed457c2e nfsd: Fix creation time serialization order) 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 (ad07149f34db tools headers UAPI: Sync linux/prctl.h with the kernel sources) 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 (2329cc7a101a drm/client: Fix memory leak in drm_client_modeset_probe) 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 (8a5829411a1e Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (06c2afb862f9 Linux 6.5-rc1) 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 (47508c7ba8db Merge branches 'microchip-dt64' 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 (d1478aea649e memory: tegra: Add dummy implementation on Tegra194) Merging imx-mxs/for-next (89c016c82e46 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 (6faff7e89223 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 (3b5ba33b4d1d Merge branch 'renesas-dts-for-v6.6' into renesas-next) Merging reset/reset/next (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS) Merging rockchip/for-next (28832358cbda Merge branch 'v6.6-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (f822ca919181 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (16f6bdd81f19 Merge branches 'for-next/juno/fixes', 'for-next/juno/updates' and 'for-next/vexpress/updates' 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 (492a5be06fb0 Merge branch for-6.6/arm64/dt into for-next) Merging ti/ti-next (8a07516806c6 Merge branch 'ti-drivers-soc-next' into ti-next) Merging xilinx/for-next (6008eee2c754 Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (f679e89acdd3 clk: tegra: Avoid calling an uninitialized function) 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 (06351cc358ea LoongArch: Fix module relocation error with binutils 2.41) Merging m68k/for-next (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1) Merging m68knommu/for-next (06c2afb862f9 Linux 6.5-rc1) Merging microblaze/next (fe15c26ee26e Linux 6.3-rc1) 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 (06c2afb862f9 Linux 6.5-rc1) 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 (06c2afb862f9 Linux 6.5-rc1) 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 (cc87d1d73c34 Merge branch 'for-next-next-v6.5-20230713' into for-next-20230713) Merging ceph/master (a282a2f10539 libceph: harden msgr2.1 frame segment length checks) Merging cifs/for-next (b04a27544103 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 (d42334578eba exfat: check if filename entries exceeds max filename length) 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 (06c2afb862f9 Linux 6.5-rc1) 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 (94c76955e86a Merge tag 'gfs2-v6.4-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) Merging jfs/jfs-next (95e2b352c03b FS: JFS: Check for read-only mounted filesystem in txBegin) 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 (76c53d9f9a9d 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 (ed04a91f718e xfs: fix uninit warning in xfs_growfs_data) Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) Merging iomap/iomap-for-next (447a0bc108e4 iomap: drop me [hch] from MAINTAINERS for iomap) Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) 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 (cf22d118b89a Merge branches 'vfs.readdir', 'vfs.misc', 'vfs.ctime', 'vfs.fchmodat2' and 'fs.proc.uapi' into vfs.all) CONFLICT (content): Merge conflict in include/linux/shmem_fs.h CONFLICT (content): Merge conflict in mm/shmem.c Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next) Merging printk/for-next (16bff6f075a1 Merge branch 'for-6.4' into for-next) Merging pci/next (ffb9381f49da Merge branch 'pci/misc') Merging pstore/for-next/pstore (efe5be6664c8 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 (4dbbaf8fbdbd hwmon: (oxp-sensors) Add support for AOKZOE A1 PRO) Merging jc_docs/docs-next (06c2afb862f9 Linux 6.5-rc1) Merging v4l-dvb/master (06c2afb862f9 Linux 6.5-rc1) Merging v4l-dvb-next/master (06c2afb862f9 Linux 6.5-rc1) Merging pm/linux-next (998829ca60f7 Merge branch 'thermal-core' into linux-next) $ git reset --hard HEAD^ Merging next-20230713 version of pm Merging cpufreq-arm/cpufreq/arm/linux-next (9d4807ffe9ef cpufreq: omap: Convert to platform remove callback returning void) Merging cpupower/cpupower (d7de5d8e403a cpupower: Bump soname version) 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 (06c2afb862f9 Linux 6.5-rc1) Merging net-next/main (ba2274dcfda8 net: wwan: t7xx: Add AP CLDMA) Merging bpf-next/for-next (1cd0e7715cad selftests/bpf: Add selftest for PTR_UNTRUSTED) 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 (2ba6216b8b37 Bluetooth: btmtk: Fix kernel crash when processing coredump) 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 (259b4d4c1308 mtd: devices: docg3: Remove unnecessary (void*) conversions) Merging nand/nand/next (2b42d718c7d7 dt-bindings: mtd: Fix nand-controller.yaml license) Merging spi-nor/spi-nor/next (4b0cb4e7ab2f dt-bindings: mtd: spi-nor: clarify the need for spi-nor compatibles) Merging crypto/master (486bfb05913a crypto: akcipher - Do not copy dst if it is NULL) Merging drm/drm-next (6725f3322807 Merge tag 'drm-misc-next-fixes-2023-07-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) Merging drm-misc/for-linux-next (7dae503584a1 drm/ssd130x: Change pixel format used to compute the buffer size) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c Merging amdgpu/drm-next (093b21f43173 Revert "drm/amdgpu: update kernel vcn ring test") Merging drm-intel/for-linux-next (290d16104575 Revert "drm/i915: use localized __diag_ignore_all() instead of per file") 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 (295b6c02f84b drm/etnaviv: slow down FE idle polling) Merging fbdev/for-next (53a90ae81a33 fbdev: imxfb: remove unneeded labels) Merging regmap/for-next (c9a823624863 Merge remote-tracking branch 'regmap/for-6.6' into regmap-next) Merging sound/for-next (67192cc0f026 ALSA: emu10k1: remove superfluous IRQ enable state saving) Merging ieee1394/for-next (06c2afb862f9 Linux 6.5-rc1) Merging sound-asoc/for-next (3acd333049b8 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 (677232f879f2 Input: iqs7211 - point to match data directly) Merging block/for-next (cfd18f91a154 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 (fd3ac6e80497 dt-bindings: phy: rockchip: rk3588 has two reset lines) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) Merging mmc/next (9289a19bce21 mmc: pxamci: Use devm_platform_get_and_ioremap_resource()) 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 (f5f8fe9226b1 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 (5b0eea835d4e selinux: introduce an initial SID for early boot processes) Merging smack/next (2c085f3a8f23 smack: Record transmuting in smk_transmuted) Merging tomoyo/master (1c7873e33645 mm: lock newly mapped VMA with corrected ordering) Merging tpmdd/next (bcd320a57f5d tpm: make all 'class' structures const) Merging watchdog/master (2500df55a615 dt-bindings: watchdog: Add Loongson-1 watchdog) Merging iommu/next (a7a334076dd7 Merge branches 'iommu/fixes', 'arm/smmu', 'ppc/pamu', 'virtio', 'x86/vt-d', 'core' and 'x86/amd' into next) Merging audit/next (06c2afb862f9 Linux 6.5-rc1) Merging devicetree/for-next (31e9f406efae dt-bindings: soc: qcom: stats: Update maintainer email) Merging dt-krzk/for-next (9d5d7ad3d517 Merge branch 'next/dt-bindings' into for-next) Merging mailbox/mailbox-for-next (1b712f18c461 mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0) Merging spi/for-next (6930bfa7a90e Merge remote-tracking branch 'spi/for-6.6' into spi-next) Merging tip/master (1a2945f27157 Merge branch into tip/master: 'x86/urgent') 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 (7408340a707e refscale: Add a "jiffies" test) 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 (88bb466c9dec Merge branches 'generic', 'misc', 'mmu', 'selftests', 'svm', 'vmx' and 'pmu') Merging xen-tip/linux-next (21a235bce123 xen/virtio: Fix NULL deref when a bridge of PCI root bus has no parent) 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 (06c2afb862f9 Linux 6.5-rc1) Merging usb/usb-next (06c2afb862f9 Linux 6.5-rc1) Merging thunderbolt/next (481012b479fe thunderbolt: Add test case for 3 DisplayPort tunnels) Merging usb-serial/usb-next (06c2afb862f9 Linux 6.5-rc1) Merging tty/tty-next (06c2afb862f9 Linux 6.5-rc1) Merging char-misc/char-misc-next (06c2afb862f9 Linux 6.5-rc1) 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 (e9fdc41a3d66 fpga: zynq-fpga: Convert to devm_platform_ioremap_resource()) Merging icc/icc-next (9bcd2e1565e4 Merge branch 'icc-fixes' into icc-next) Merging iio/togreg (9e66fb524495 samples: Add userspace example for TI TPS6594 PFSM) Merging phy-next/next (76009ee76e05 phy: zynqmp: Allow variation in refclk rate) Merging soundwire/next (06c2afb862f9 Linux 6.5-rc1) Merging extcon/extcon-next (94da3da96c35 dt-bindings: extcon: wlf,arizona: drop unneeded quotes) Merging gnss/gnss-next (06c2afb862f9 Linux 6.5-rc1) 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 (06c2afb862f9 Linux 6.5-rc1) 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 (d1d4ff5d11a5 cgroup: put cgroup_tryget_css() inside CONFIG_CGROUP_SCHED) CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/.gitignore CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/Makefile 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 (81aceef4b71d Merge branches 'hwspinlock-next' and 'rproc-next' into for-next) Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1) Merging gpio-brgl/gpio/for-next (0f93a345aa42 gpiolib: order includes alphabetically in gpiolib.h) Merging gpio-intel/for-next (06c2afb862f9 Linux 6.5-rc1) Merging pinctrl/for-next (04e601f2a71c Merge tag 'renesas-pinctrl-fixes-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into fixes) 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 (06c2afb862f9 Linux 6.5-rc1) Merging kunit/test (06c2afb862f9 Linux 6.5-rc1) Merging kunit-next/kunit (06c2afb862f9 Linux 6.5-rc1) 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 (f373d301908a 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 (3a7e4daf7aea 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 (44f6a42d4935 mm/slub: refactor freelist to use custom type) 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 (5664eaac4dcf sysctl: fix unused proc_cap_handler() function warning) Merging execve/for-next/execve (aa88054b7090 binfmt_elf: fix comment typo s/reset/regset/) Merging bitmap/bitmap-for-next (7e281084b62c lib: test for_each_numa_cpus()) Merging hte/for-next (ac9a78681b92 Linux 6.4-rc1) Merging kspp/for-next/kspp (ec7633de404e sparc: mark __arch_xchg() as __always_inline) Merging kspp-gustavo/for-next/kspp (221a4b56ec70 sparc: openpromio: Address -Warray-bounds warning) Merging iommufd/for-next (06c2afb862f9 Linux 6.5-rc1)
Attachment:
pgpWygirxgjd9.pgp
Description: OpenPGP digital signature
