Hi all, Changes since 20230609: The mm tree gained a build failure for which I applied a hack. The arm-soc tree gained a build failure so I used the version from next-20230609. The net-next tree gained a conflict against the rdma-fixes tree. It also gained a build failure for which I applied a patch. The bluetooth tree gained a build failure for which I reverted a commit. The block tree gained conflicts against the ext4 and net-next trees. The mcc tree lost its build failure. The slab tree gained a conflict against the mips tree. Non-merge commits (relative to Linus' tree): 8486 9404 files changed, 396128 insertions(+), 133117 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 363 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 (fb054096aea0 Merge tag 'mm-hotfixes-stable-2023-06-12-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging mm-hotfixes/mm-hotfixes-unstable (10c34df9fc00 nilfs2: prevent general protection fault in nilfs_clear_dirty_page()) Merging kbuild-current/fixes (f1fcbaa18b28 Linux 6.4-rc2) 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 (0e2aba694866 arm64: mm: pass original fault address to handle_mm_fault() in PER_VMA_LOCK block) Merging arm-soc-fixes/arm/fixes (5cdd5ec17654 Merge tag 'imx-fixes-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes) Merging davinci-current/davinci/for-current (ac9a78681b92 Linux 6.4-rc1) Merging drivers-memory-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) Merging m68k-current/for-linus (b845b574f86d m68k: Move signal frame following exception on 68020/030) Merging powerpc-fixes/fixes (719dfd5925e1 powerpc/xmon: Use KSYM_NAME_LEN in array size) Merging s390-fixes/fixes (03c5c83b70dc s390/purgatory: disable branch profiling) 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 (75e6def3b267 sctp: fix an error code in sctp_sf_eat_auth()) Merging bpf/master (ad96f1c9138e bpf: Fix a bpf_jit_dump issue for x86_64 with sysctl bpf_jit_enable.) Merging ipsec/master (842665a9008a xfrm: Use xfrm_state selector for BEET input) Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging ipvs/main (ab39b113e747 Merge tag 'for-net-2023-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging wireless/for-next (d094482c9974 wifi: mac80211: fragment per STA profile correctly) Merging wpan/master (bd4e3d82f4cc MAINTAINERS: Add wpan patchwork) Merging rdma-fixes/for-rc (fd06a5925e47 RDMA/cma: prevent rdma id destroy during cma_iw_handler) Merging sound-current/for-linus (74d00abbe9f9 ALSA: usb-audio: Fix broken resume due to UAC3 power state) Merging sound-asoc-fixes/for-linus (ad24919540fb firmware: cs_dsp: Log correct region name in bin error messages) Merging regmap-fixes/for-linus (0cc6578048e0 regmap: maple: Drop the RCU read lock while syncing registers) Merging regulator-fixes/for-linus (b00de0000a69 regulator: qcom-rpmh: Fix regulators for PM8550) Merging spi-fixes/for-linus (c5c31fb71f16 spi: fsl-dspi: avoid SCK glitches with continuous transfers) Merging pci-current/for-linus (40994ce0ea01 MAINTAINERS: Add Chuanhua Lei as Intel LGM GW PCIe maintainer) Merging driver-core.current/driver-core-linus (9561de3a55be Linux 6.4-rc5) Merging tty.current/tty-linus (306320034e8f serial: lantiq: add missing interrupt ack) Merging usb.current/usb-linus (7b672f282cf4 Merge tag 'usb-serial-6.4-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-serial-fixes/usb-linus (f1832e2b5e49 USB: serial: option: add Quectel EM061KGL series) Merging phy/fixes (9561de3a55be Linux 6.4-rc5) Merging staging.current/staging-linus (b3dad076a058 staging: octeon: delete my name from TODO contact) Merging iio-fixes/fixes-togreg (c57fa0037024 meson saradc: fix clock divider mask length) Merging counter-current/counter-current (ac9a78681b92 Linux 6.4-rc1) Merging char-misc.current/char-misc-linus (9561de3a55be Linux 6.4-rc5) Merging soundwire-fixes/fixes (858fd168a95c Linux 6.4-rc6) Merging thunderbolt-fixes/fixes (9f9666e65359 thunderbolt: Mask ring interrupt on Intel hardware as well) Merging input-current/for-linus (feee70f45686 Input: xpad - delete a Razer DeathAdder mouse VID/PID entry) Merging crypto-current/master (6ab39f99927e crypto: x86/aria - Use 16 byte alignment for GFNI constant vectors) Merging vfio-fixes/for-linus (4752354af710 vfio/type1: check pfn valid before converting to struct page) Merging kselftest-fixes/fixes (dbcf76390eb9 selftests/ftrace: Improve integration with kselftest runner) Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) Merging dmaengine-fixes/fixes (e14fd2af7a1d dmaengine: at_hdmac: Extend the Flow Controller bitfield to three bits) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (c4d28e30a8d0 mtd: rawnand: marvell: don't set the NAND frequency select) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (2dda00649e5c Revert "media: dvb-core: Fix use-after-free on race condition at dvb_frontend") Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) Merging mips-fixes/mips-fixes (4897a898a216 mips: Move initrd_start check after initrd address sanitisation.) Merging at91-fixes/at91-fixes (6b0db163ff92 ARM: dts: at91: sama7g5ek: fix debounce delay property for shdwc) Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) Merging kvm-fixes/master (f211b45057d8 Merge tag 'kvm-x86-fixes-6.4' of https://github.com/kvm-x86/linux 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 (f01726aafaeb Merge branch 'misc-6.4' 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 (fb109fba7284 platform/x86: int3472: Avoid crash in unregistering regulator gpio) Merging samsung-krzk-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging pinctrl-samsung-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging devicetree-fixes/dt/linus (5b47f56b6a0f dt-bindings: i3c: silvaco,i3c-master: fix missing schema restriction) Merging dt-krzk-fixes/fixes (8bbec86ce6d6 dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning) Merging scsi-fixes/fixes (6d074ce23177 scsi: stex: Fix gcc 13 warnings) Merging drm-fixes/drm-fixes (858fd168a95c Linux 6.4-rc6) Merging drm-intel-fixes/for-linux-next-fixes (4a10c42ec363 drm/i915/gvt: remove unused variable gma_bottom in command parser) Merging mmc-fixes/fixes (8c345dff1804 mmc: usdhi60rol0: fix deferred probing) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (44c026a73be8 Linux 6.4-rc3) Merging hyperv-fixes/hyperv-fixes (ec97e112985c Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails) Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (99a670b2069c riscv: fix kprobe __user string arg print fault issue) Merging riscv-dt-fixes/riscv-dt-fixes (ac9a78681b92 Linux 6.4-rc1) Merging riscv-soc-fixes/riscv-soc-fixes (a7a041f2ddf3 soc: microchip: mpfs: handle failed system service requests) Merging fpga-fixes/fixes (44c026a73be8 Linux 6.4-rc3) Merging spdx/spdx-linus (9561de3a55be Linux 6.4-rc5) Merging gpio-brgl-fixes/gpio/for-current (858fd168a95c Linux 6.4-rc6) Merging gpio-intel-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging pinctrl-intel-fixes/fixes (7877cb91f108 Linux 6.4-rc4) Merging erofs-fixes/fixes (7877cb91f108 Linux 6.4-rc4) Merging kunit-fixes/kunit-fixes (ac9a78681b92 Linux 6.4-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 (c034203b6a9d nfsd: fix double fget() bug in __write_ports_addfd()) Merging irqchip-fixes/irq/irqchip-fixes (91539341a3b6 irqchip/gic: Correctly validate OF quirk descriptors) 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/urgent (48b1320a674e Merge tag 'for-6.4-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) 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 (95339f40a8b6 power: supply: Fix logic checking if system is running from battery) 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 (f1fcbaa18b28 Linux 6.4-rc2) Merging rust-fixes/rust-fixes (ac9a78681b92 Linux 6.4-rc1) Merging v9fs-fixes/fixes/next (36896bc97c0e fs/9p: Fix a datatype used with V9FS_DIRECT_IO) Merging w1-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging drm-misc-fixes/for-linux-next-fixes (61d8cdb7872c accel/qaic: Fix NULL pointer deref in qaic_destroy_drm_device()) Merging mm-stable/mm-stable (a6e79df92e4a mm/gup: disallow FOLL_LONGTERM GUP-fast writing to file-backed mappings) Merging mm-nonmm-stable/mm-nonmm-stable (a94181ec064b syscalls: add sys_ni_posix_timers prototype) Merging mm/mm-everything (675bc66600fa Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (7e67dd4899d8 Revert "[PATCH] uml: export symbols added by GCC hardened") Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf-tools-next (fe8e04348727 perf script: Increase PID/TID width for output) Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2) Merging dma-mapping/for-next (0a2f6372a43f drm/nouveau: stop using is_swiotlb_active) Merging asm-generic/master (3b1ddbb62e7e Merge tag 'virt-to-pfn-for-arch-v6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into asm-generic) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (fc6750b0d4a9 Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (d18070cbad87 Merge branch 'for-next/feat_s1pie' into for-next/core) Merging arm-perf/for-next/perf (b1acb4e5601b dt-bindings: perf: fsl-imx-ddr: Add i.MX93 compatible) Merging arm-soc/for-next (15d2ee76762d Merge branch 'soc/arm' into for-next) $ git reset --hard HEAD^ Merging next-20230609 version of arm-soc Merging amlogic/for-next (b857a3593956 Merge branch 'v6.5/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 (7d4f0b0df7c5 ARM: dts: aspeed-g6: Add UDMA node) Merging at91/at91-next (9c8457a847fa Merge branch 'clk-microchip' into at91-next) Merging broadcom/next (3d86637615ea Merge branch 'devicetree/next' into next) CONFLICT (content): Merge conflict in MAINTAINERS Merging davinci/davinci/for-next (ac9a78681b92 Linux 6.4-rc1) Merging drivers-memory/for-next (6a66fb9ffe7b dt-bindings: memory-controllers: drop unneeded quotes) 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 (64687391f64d Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (972e3fc791a8 Merge branch 'omap-for-v6.5/cleanup' into for-next) Merging qcom/for-next (8d5a57ea6a0b Merge branches 'arm64-defconfig-for-6.5', 'arm64-fixes-for-6.4', 'arm64-for-6.5', 'clk-for-6.5', 'drivers-fixes-for-6.4', 'drivers-for-6.5', 'dts-fixes-for-6.4' and 'dts-for-6.5' into for-next) Merging renesas/next (7762defcdaf0 Merge branch 'renesas-drivers-for-v6.5' into renesas-next) Merging reset/reset/next (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS) Merging rockchip/for-next (dd738a0f90f7 Merge branch 'v6.5-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (878094dcccc3 Merge branch 'next/clk' into for-next) Merging scmi/for-linux-next (83ff850e73ba Merge tag 'scmi-updates-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (c9cb7e72e293 MAINTAINERS: add entry for ARM/STM32 ARCHITECTURE) Merging sunxi/sunxi/for-next (1bcb932283c9 Merge branch 'sunxi/dt-for-6.5' into sunxi/for-next) Merging tee/next (86dfcfab4fe0 Merge branch 'optee_fix_async_notif_for-v6.3' into next) Merging tegra/for-next (d7e22e94908d Merge branch for-6.5/arm64/dt into for-next) Merging ti/ti-next (79c0a9fe69a9 Merge branch 'ti-keystone-dts-next' into ti-next) Merging xilinx/for-next (a736607599a5 Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (956e16327da8 Merge branch 'clk-determine-rate' into clk-next) Merging clk-imx/for-next (878b02d5f3b5 clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe()) Merging clk-renesas/renesas-clk (7df8eea64a41 clk: renesas: rzg2l: Convert to readl_poll_timeout_atomic()) Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) Merging csky/linux-next (ac9a78681b92 Linux 6.4-rc1) Merging loongarch/loongarch-next (f21d3aad8c22 LoongArch: Update Loongson-3 default config file) Merging m68k/for-next (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1) Merging m68knommu/for-next (858fd168a95c Linux 6.4-rc6) Merging microblaze/next (fe15c26ee26e Linux 6.3-rc1) Merging mips/mips-next (5cad8323040b mips: dts: ralink: mt7628a: Unify pinctrl-single pin group nodes) Merging openrisc/for-next (c91b4a07655d openrisc: Add floating point regset) Merging parisc-hd/for-next (fc49c9672cda parisc: Check if IRQs are disabled when calling arch_local_irq_restore()) Merging powerpc/next (7d3ee229ea51 powerpc: Drop MPC5200 LocalPlus bus FIFO driver) Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) Merging risc-v/for-next (d5e45e810e0e Merge patch series "riscv: Add vector ISA support") CONFLICT (content): Merge conflict in MAINTAINERS Merging riscv-dt/riscv-dt-for-next (e2c510d6d630 riscv: dts: starfive: Add cpu scaling for JH7110 SoC) Merging riscv-soc/riscv-soc-for-next (ac9a78681b92 Linux 6.4-rc1) Merging s390/for-next (c561c922e242 Merge branch 'features' into for-next) Merging sh/for-next (a8ac2961148e sh: Avoid using IRQ0 on SH3 and SH4) Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable) Merging xtensa/xtensa-for-next (f2a12f6dbe7a xtensa: drop ARCH_WANT_FRAME_POINTERS) Merging pidfd/for-next (757777eef55b pid: Replace struct pid 1-element array with flex-array) Merging fscrypt/for-next (d617ef039fb8 fscrypt: Replace 1-element array with flexible array) Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums) Merging btrfs/for-next (fe74cee6588a Merge branch 'for-next-next-v6.4-20230613' into for-next-20230613) CONFLICT (content): Merge conflict in fs/btrfs/file.c Merging ceph/master (409e873ea3c1 ceph: fix use-after-free bug for inodes when flushing capsnaps) Merging cifs/for-next (9419188dfd86 cifs: add a warning when the in-flight count goes negative) Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (a050c691305b erofs: fix compact 4B support for 16k block size) Merging exfat/dev (fe15c26ee26e Linux 6.3-rc1) Merging ext3/for_next (15bb03a6c517 Pull cleanup of fsnotify_open() callsites.) Merging ext4/dev (11761ed6026e jbd2: remove __journal_try_to_free_buffer()) Merging f2fs/dev (4138d5a9121b f2fs: introduce F2FS_QUOTA_DEFAULT_FL for cleanup) Merging fsverity/for-next (13e2408d02dd fsverity: simplify error handling in verify_data_block()) Merging fuse/for-next (c68ea140050e fuse: remove duplicate check for nodeid) Merging gfs2/for-next (c8ed1b359312 gfs2: Fix duplicate should_fault_in_pages() call) Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative) Merging ksmbd/ksmbd-for-next (6aa78d3c48c3 ksmbd: use kvzalloc instead of kvmalloc) Merging nfs/linux-next (9561de3a55be Linux 6.4-rc5) Merging nfs-anna/linux-next (43439d858bba NFSv4.2: Fix a potential double free with READ_PLUS) Merging nfsd/nfsd-next (9fdc74a8d3f2 SUNRPC: Remove transport class dprintk call sites) Merging ntfs3/master (1f60ec888102 fs/ntfs3: Add support /proc/fs/ntfs3/<dev>/volinfo and /proc/fs/ntfs3/<dev>/label) Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) Merging overlayfs/overlayfs-next (f777c8266c12 ovl: implement lazy lookup of lowerdata in data-only layers) 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 (ac9a78681b92 Linux 6.4-rc1) Merging xfs/for-next (d4d12c02bf5f xfs: collect errors from inodegc for unlinked inode recovery) Merging zonefs/for-next (bfb3dbc35982 zonefs: use iomap for synchronous direct writes) Merging iomap/iomap-for-next (3fd41721cd5c iomap: Add DIO tracepoints) Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) Merging file-locks/locks-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()') Merging iversion/iversion-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()') Merging vfs-brauner/vfs.all (61a4f7c28e28 Merge branches 'vfs.misc', 'v6.5/vfs.mount', 'fs.ntfs' and 'vfs.rename.locking' into vfs.all) 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 (5b9283e1ec21 Merge branch 'pci/controller/endpoint') Merging pstore/for-next/pstore (48f2c681df43 pstore/ram: Convert to platform remove callback returning void) Merging hid/for-next (e2cbca364fe7 Merge branch 'for-6.4/upstream-fixes' into for-next) Merging i2c/i2c/for-next (0fa1d7f8a036 Merge branch 'i2c/for-current' into i2c/for-next) 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 (7357b1876b21 hwmon: (tmp464) Use maple tree register cache) Merging jc_docs/docs-next (d27e40b55481 docs: crypto: async-tx-api: fix typo in struct name) Merging v4l-dvb/master (be9aac187433 Merge tag 'v6.4-rc5' into media_stage) Merging v4l-dvb-next/master (57713028261e Merge tag 'br-v6.5h' of git://linuxtv.org/hverkuil/media_tree into media_stage) Merging pm/linux-next (7796be1562e2 Merge branch 'acpi-resource' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (3b062a086984 cpufreq: dt-platdev: Support building as module) Merging cpupower/cpupower (25891bc945f7 cpupower: Bump soname version) Merging devfreq/devfreq-next (a83bfdca8b20 PM / devfreq: mtk-cci: Fix variable deferencing before NULL check) Merging opp/opp/linux-next (b2a2ab039bd5 opp: Fix use-after-free in lazy_opp_tables after probe deferral) Merging thermal/thermal/linux-next (2afa82d1fc64 dt-bindings: thermal: qcom-tsens: Correct unit address) Merging dlm/next (57e2c2f2d94c fs: dlm: fix mismatch of plock results from userspace) Merging rdma/for-next (830f93f47068 RDMA/bnxt_re: optimize the parameters passed to helper functions) Merging net-next/main (ccbe64be1533 Merge branch 'net-flower-add-cfm-support') CONFLICT (content): Merge conflict in fs/netfs/iterator.c CONFLICT (content): Merge conflict in include/linux/mlx5/driver.h Applying: fix up for "Move netfs_extract_iter_to_sg() to lib/scatterlist.c" Merging bpf-next/for-next (25085b4e9251 bpf/docs: Update documentation for new cpumask kfuncs) 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/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/main (4f325e26277b ipvs: dynamically limit the connection hash table) Merging bluetooth/master (817efd3cad74 Bluetooth: hci_sock: Forward credentials to monitor) CONFLICT (content): Merge conflict in net/bluetooth/hci_event.c Applying: Revert "Bluetooth: hci_sock: Forward credentials to monitor" Merging wireless-next/for-next (cabb8b48e542 Merge branch 'mptcp-unify-pm-interfaces') Merging wpan-next/master (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited) Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) Merging mtd/mtd/next (3b270fac8443 mtd: otp: Put factory OTP/NVRAM into the entropy pool) Merging nand/nand/next (46c37b99b5cb mtd: rawnand: meson: check buffer length) Merging spi-nor/spi-nor/next (df6def86b9dc mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt) Merging crypto/master (e3023094dffb dm crypt: Avoid using MAX_CIPHER_BLOCKSIZE) Merging drm/drm-next (ba57b9b11f78 Merge tag 'drm-intel-gt-next-2023-06-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c Merging drm-misc/for-linux-next (c2807ecb5290 drm/omap: Convert to platform remove callback returning void) Merging amdgpu/drm-next (3b718dcaf163 drm/amd/display: Filter out AC mode frequencies on DC mode systems) 353491c48697 ("Revert "drm/amd/display: Block optimize on consecutive FAMS enables"") 360930985ec9 ("Revert "drm/amd/display: Do not set drr on pipe commit"") 5a03159ab7ef ("Revert "drm/amdgpu: switch to golden tsc registers for raven/raven2"") a15a77c8e61d ("Revert "drm/amdgpu: change the reference clock for raven/raven2"") f9bfc9fff299 ("Revert "drm/amdgpu: Differentiate between Raven2 and Raven/Picasso according to revision id"") CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.h CONFLICT (content): Merge conflict in include/drm/display/drm_dp.h Merging drm-intel/for-linux-next (b02a9a0c6cb3 drm/i915/gmch: avoid unused variable warning) Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (1b90e8f8879c drm/msm/adreno: change adreno_is_* functions to accept const argument) Merging drm-msm-lumag/msm-next-lumag (1088cbb0f2e3 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu' and 'msm-next-lumag-dsi' into msm-next-lumag) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info) Merging fbdev/for-next (79a3908d1ea6 fbdev: omapfb: lcd_mipid: Fix an error handling path in mipid_spi_probe()) Merging regmap/for-next (ecfb8ce26d02 regmap: Provide basic test coverage for raw I/O) Merging sound/for-next (9b4469410cf9 ALSA: firewire: use 'GPL' string for module license contributed by Clemens Ladisch) CONFLICT (content): Merge conflict in include/linux/pci_ids.h Merging ieee1394/for-next (06f45435d985 firewire: core: obsolete usage of GFP_ATOMIC at building node tree) Merging sound-asoc/for-next (4e3bbb459aee Merge remote-tracking branch 'asoc/for-6.5' into asoc-next) Merging modules/modules-next (0eeaf1eb40a3 kallsyms: make kallsyms_show_value() as generic function) Merging input/next (8c9cce9cb81b Input: pm8941-powerkey - fix debounce on gen2+ PMICs) Merging block/for-next (48c00a3e1008 Merge branch 'for-6.5/block' into for-next) CONFLICT (content): Merge conflict in fs/ext4/super.c CONFLICT (content): Merge conflict in fs/splice.c Merging device-mapper/for-next (56fa445f80e1 dm thin: update .io_hints methods to not require handling discards last) Merging libata/for-next (43cff7d94370 ata: libata-scsi: Use ata_ncq_supported in ata_scsi_dev_config()) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) Merging mmc/next (e92396625f79 mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (912485ca216a mfd: stpmic1: Add PMIC poweroff via sys-off handler) Merging backlight/for-backlight-next (a8b09e6fe3ee dt-bindings: backlight: pwm: Make power-supply not required) Merging battery/for-next (4dea2fd6e83c power: reset: qcom-pon: add support for pm8941-pon) Merging regulator/for-next (21910faafe70 Merge remote-tracking branch 'regulator/for-6.5' into regulator-next) Merging security/next (b432b5517644 MAINTAINERS: move labeled networking to "supported") Merging apparmor/apparmor-next (e31dd6e412f7 apparmor: fix: kzalloc perms tables for shared dfas) Merging integrity/next-integrity (95526d13038c ima: Fix build warnings) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (447a5688005e selinux: avoid bool as identifier name) CONFLICT (content): Merge conflict in security/selinux/Makefile Merging smack/next (2c085f3a8f23 smack: Record transmuting in smk_transmuted) Merging tomoyo/master (933fd4391e3d workqueue: Emit runtime message when flush_scheduled_work() is called) Merging tpmdd/next (bcd6987b87b1 tpm: Switch i2c drivers back to use .probe()) Merging watchdog/master (fc4354c6e5c2 Merge tag 'mm-stable-2023-05-06-10-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) Merging iommu/next (fe420865bd74 Merge branches 'arm/smmu', 'ppc/pamu', 'virtio', 'x86/amd' and 'core' into next) Merging audit/next (e455ca40dbcf audit: avoid missing-prototype warnings) Merging devicetree/for-next (48964ea50951 dt-bindings: vendor-prefixes: document TeeJet) Merging dt-krzk/for-next (0ff3c07556e6 Merge branch 'next/dt64' into for-next) Merging mailbox/mailbox-for-next (8fe72b76db79 mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()) Merging spi/for-next (46bc71bc5424 Merge remote-tracking branch 'spi/for-6.5' into spi-next) Merging tip/master (7728822622f7 Merge x86/microcode into tip/master) CONFLICT (content): Merge conflict in tools/objtool/check.c CONFLICT (content): Merge conflict in tools/perf/arch/x86/include/arch-tests.h CONFLICT (content): Merge conflict in tools/perf/arch/x86/tests/arch-tests.c Applying: perf test amd: Fix build failure with amd-ibs-via-core-pmu.c Applying: fix up for "objtool: Move noreturn function list to separate file" Merging clockevents/timers/drivers/next (158009f1b4a3 timekeeping: Fix references to nonexistent ktime_get_fast_ns()) Merging edac/edac-for-next (852667c317ae Merge ras/edac-drivers into for-next) Merging irqchip/irq/irqchip-next (2b384e01fd12 Merge branch irq/gic-v3-asr8601 into irq/irqchip-next) Merging ftrace/for-next (3862f86c1529 Merge tools/for-next) Merging rcu/rcu/next (de2b5ae75f68 documentation/rcu: Fix typo) Applying: fixup for "RDMA/rxe: Add error messages" Merging kvm/next (39428f6ea9ea Merge tag 'kvmarm-fixes-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvm-arm/next (96080252ab98 Merge branch kvm-arm64/ffa-proxy into kvmarm/next) CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c Merging kvms390/next (c2da70d73763 s390/uv: Update query for secret-UVCs) CONFLICT (content): Merge conflict in Makefile Merging kvm-riscv/riscv_kvm_next (95c99104cb42 RISC-V: KVM: Probe for SBI extension status) Merging kvm-x86/next (24ff4c08e5bb Merge branches 'generic', 'misc', 'mmu', 'selftests', 'svm', 'vmx' and 'pmu') Merging xen-tip/linux-next (335b4223466d x86/pci/xen: populate MSI sysfs entries) Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) Merging workqueues/for-next (ee360b1c5001 Merge branch 'for-6.5-cleanup-ordered' into for-next) Merging drivers-x86/for-next (2515e54267c9 platform/x86: hp-wmi: Add thermal profile for Victus 16-d1xxx) Merging chrome-platform/for-next (f5bb4e381290 platform/chrome: Switch i2c drivers back to use .probe()) Merging hsi/for-next (42877c38ac78 HSI: omap_ssi_port: Drop error checking for debugfs_create_dir) Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds-lj/for-leds-next (e338a05e76ca dt-bindings: leds: Add binding for AW200xx) Merging ipmi/for-next (02210d52641a dt-bindings: ipmi: aspeed,ast2400-kcs-bmc: drop unneeded quotes) Merging driver-core/driver-core-next (16b58423b4c3 Merge 6.4-rc5 into driver-core-next) Merging usb/usb-next (d37537a1f7cf Merge 6.4-rc5 into usb-next) Merging thunderbolt/next (87200371817e thunderbolt: Enable/disable sideband depending on USB4 port offline mode) Merging usb-serial/usb-next (c9d934053d9e USB: serial: report unsupported break signalling) Merging tty/tty-next (52861a3be8d6 serial: core: don't kfree device managed data) Merging char-misc/char-misc-next (5959fe74c993 Merge 6.4-rc5 into char-misc-next) Merging accel/habanalabs-next (e6f49e96bc57 accel/habanalabs: refactor error info reset) Merging coresight/next (83e92e301eb2 MAINTAINERS: coresight: Add James Clark as Reviewer) Merging fastrpc/for-next (ac9a78681b92 Linux 6.4-rc1) Merging fpga/for-next (47147d56f92e fpga: zynq-fpga: Ensure proper xCAP interface switch) Merging icc/icc-next (1400725e4515 Merge branch 'icc-qos' into icc-next) Merging iio/togreg (0cf9a77e80fa dt-bindings: iio: rockchip: Fix 'oneOf' condition failed warning) Merging phy-next/next (1eac0f956608 dt-bindings: phy: qcom,qmp-usb: fix bindings error) Merging soundwire/next (038306aabee6 soundwire: debugfs: Add missing SCP registers) Merging extcon/extcon-next (94da3da96c35 dt-bindings: extcon: wlf,arizona: drop unneeded quotes) Merging gnss/gnss-next (44c026a73be8 Linux 6.4-rc3) Merging vfio/next (d9824f70e52c vfio/pci: Also demote hiding standard cap messages) Merging w1/for-next (b332af5398a3 w1: Replace usage of found with dedicated list iterator variable) Merging staging/staging-next (c6e9da9d5566 staging: rtl8192e: clean unnecessary braces warning on r8192E_phy.c) Merging counter-next/counter-next (d428487471ba counter: i8254: Introduce the Intel 8254 interface library module) Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) Merging dmaengine/next (907514a7dc4c dmaengine: sprd: Don't set chancnt) Merging cgroup/for-next (18740f47e5fa Merge branch 'for-6.5' into for-next) Merging scsi/for-next (5320d65f360d Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (022000d3f586 scsi: qla2xxx: Drop useless LIST_HEAD) Merging vhost/linux-next (233cc7c52210 Revert "virtio-blk: support completion batching for the IRQ path") Merging rpmsg/for-next (1ca04f21b204 remoteproc: stm32: Fix error code in stm32_rproc_parse_dt()) Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1) Merging gpio-brgl/gpio/for-next (b0ce9ce408b6 gpiolib: Do not unexport GPIO on freeing) Merging gpio-intel/for-next (ac9a78681b92 Linux 6.4-rc1) Merging pinctrl/for-next (386ea4292487 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (c518d31b2a33 pinctrl: baytrail: Use str_hi_lo() helper) Merging pinctrl-renesas/renesas-pinctrl (5d32cead772c pinctrl: renesas: Fix spaces followed by tabs) Merging pinctrl-samsung/for-next (ac9a78681b92 Linux 6.4-rc1) Merging pwm/for-next (247ee6c78040 pwm: Remove unused radix tree) 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 (8cd0d8633e2d selftests/ftace: Fix KTAP output ordering) Merging kunit/test (ac9a78681b92 Linux 6.4-rc1) Merging kunit-next/kunit (fefdb43943c1 Documentation: kunit: Rename references to kunit_abort()) Merging livepatching/for-next (ac4890f97211 Merge branch 'for-6.5/core' into for-next) Merging rtc/rtc-next (38e0689b27f8 rtc: stm32: remove dedicated wakeup management) Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) Merging at24/at24/for-next (a3c10035d12f eeprom: at24: Use dev_err_probe for nvmem register failure) Merging ntb/ntb-next (942cc9ceccb6 ntb: intel: Remove redundant pci_clear_master) Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning) Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) Merging slimbus/for-next (ac9a78681b92 Linux 6.4-rc1) Merging nvmem/for-next (ac1c0d15aedc nvmem: core: add support for fixed cells *layout*) 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 (c1cb81429df4 kdb: Fix the putarea helper function) Merging hmm/hmm (ac9a78681b92 Linux 6.4-rc1) Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) Merging mhi/mhi-next (6bb6aba2f57a bus: mhi: host: pci_generic: Add support for Quectel EM160R-GL modem) Merging memblock/for-next (de649e7f5edb memblock: Update nid info in memblock debugfs) Merging cxl/next (a70fc4ed20a6 cxl/port: Fix NULL pointer access in devm_cxl_add_port()) Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) Merging efi/next (d0a1865cf7e2 efi/esrt: Allow ESRT access without CAP_SYS_ADMIN) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (62f69e4be588 Merge branches 'slab/for-6.5/prandom', 'slab/for-6.5/slab_no_merge' and 'slab/for-6.5/slab-deprecate' into slab/for-next) CONFLICT (content): Merge conflict in arch/mips/configs/ci20_defconfig 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 (2b2e5c0d817f sysctl: replace child with a flags var) Merging execve/for-next/execve (36650a357eac binfmt: Slightly simplify elf_fdpic_map_file()) Merging bitmap/bitmap-for-next (714f3af11b21 cpumask: fix function description kernel-doc notation) CONFLICT (content): Merge conflict in include/linux/cpumask.h Merging hte/for-next (ac9a78681b92 Linux 6.4-rc1) Merging kspp/for-next/kspp (b2f10148ec1e kobject: Use return value of strreplace()) Merging kspp-gustavo/for-next/kspp (1fa89cccd288 media: venus: hfi_cmds: Replace fake flex-arrays with flexible-array members) Merging iommufd/for-next (f1fcbaa18b28 Linux 6.4-rc2) Applying: fix up for "mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN" Applying: Fix a sparc64 use of the gso functions
Attachment:
pgprRMHPZdUV9.pgp
Description: OpenPGP digital signature
