Hi all, Changes since 20230608: The net-next tree gained a conflict against the asm-generic tree. The mcc tree gained a build failure so I used the version from next-20230608. The tip tree gained a conflict against the btrfs tree. Non-merge commits (relative to Linus' tree): 7469 8562 files changed, 340078 insertions(+), 117457 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 (8d15d5e1851b Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging mm-hotfixes/mm-hotfixes-unstable (fd04181f1021 mm/khugepaged: fix iteration in collapse_file) 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 (08425abbab99 Merge tag 'ffa-fix-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/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 (21225873be14 net: enetc: correct the indexes of highest and 2nd highest TCs) Merging bpf/master (f57ade27fc3e selftests/bpf: Add test cases to assert proper ID tracking on spill) Merging ipsec/master (bf06fcf4be0f xfrm: add missed call to delete offloaded policies) 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 (f7e60032c661 wifi: cfg80211: fix locking in regulatory disconnect) Merging wpan/master (bd4e3d82f4cc MAINTAINERS: Add wpan patchwork) Merging rdma-fixes/for-rc (5842d1d9c1b0 RDMA/irdma: Fix Local Invalidate fencing) Merging sound-current/for-linus (b752a385b584 ALSA: hda/realtek: Enable 4 amplifiers instead of 2 on a HP platform) 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 (2a881183dc5a phy: qcom-snps: correct struct qcom_snps_hsphy kerneldoc) Merging staging.current/staging-linus (b3dad076a058 staging: octeon: delete my name from TODO contact) Merging iio-fixes/fixes-togreg (b410a9307bc3 iio: accel: fxls8962af: errata bug only applicable for FXLS8962AF) 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 (58d95889f3c2 soundwire: stream: Add missing clear of alloc_slave_rt) 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 (81f3affa19d6 media: uvcvideo: Don't expose unsupported formats to userspace) 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 (710231c58a69 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 (2a567c1e2930 dt-bindings: net: realtek-bluetooth: Fix double RTL8723CS in desc) 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 (9561de3a55be Linux 6.4-rc5) Merging drm-intel-fixes/for-linux-next-fixes (79d0150d2d98 drm/i915/selftests: Add some missing error propagation) Merging mmc-fixes/fixes (e2b8f659bb80 mmc: sdhci-msm: Disable broken 64-bit DMA on MSM8916) 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 (d1f11f41eb74 MAINTAINERS: add Andy Shevchenko as reviewer for the GPIO subsystem) 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 (a3efabee5878 accel/ivpu: Fix sporadic VPU boot failure) Merging mm-stable/mm-stable (7877cb91f108 Linux 6.4-rc4) Merging mm-nonmm-stable/mm-nonmm-stable (7877cb91f108 Linux 6.4-rc4) Merging mm/mm-everything (2ea3e2fbb762 Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (3a3f1e573a10 modpost: fix off by one in is_executable_section()) 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 (693405cf1135 swiotlb: use the atomic counter of total used slabs if available) 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 (76a57b700b9d Merge branch 'for-next/feat_s1pie' into for-next/core) Merging arm-perf/for-next/perf (8be3593b9efa drivers/perf: apple_m1: Force 63bit counters for M2 CPUs) Merging arm-soc/for-next (e5047345bb6c soc: document merges) Merging amlogic/for-next (8fb90cd6a66f Merge branch 'v6.5/arm-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 (1ada87a05856 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 (d3369a4b6f01 memory: atmel-sdramc: remove the driver) Merging imx-mxs/for-next (a5f80078e832 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (8a5cc5b87d9d 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 (e79998a705d1 Merge branch 'v6.5-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (a3119e95a0d1 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (1e1dcfba9668 Merge branch 'for-next/scmi/updates' 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 (91f462c6dcc7 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 (be2033a8660c Merge branch 'clk-i2cid' into clk-next) Merging clk-imx/for-next (632c60ecd25d clk: imx: scu: use _safe list iterator to avoid a use after free) 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 (72b44f6577f1 nubus: Don't list slot resources by default) Merging m68knommu/for-next (9561de3a55be Linux 6.4-rc5) Merging microblaze/next (fe15c26ee26e Linux 6.3-rc1) Merging mips/mips-next (c5e4d83872ae mips: dts: ingenic: x1000: Add AIC device tree node) 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 (7b1a78babd0d soc/fsl/qe: fix usb.c build errors) Merging risc-v/for-next (748462b59f90 Merge patch series "riscv: allow case-insensitive ISA string parsing") 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 (bc9d1f0cecd2 sh: j2: Use ioremap() to translate device tree address into kernel memory) Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable) Merging xtensa/xtensa-for-next (d0f94ebe1864 xtensa: add asm-prototypes.h) 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 (579c8e8bbf49 Merge branch 'for-next-next-v6.4-20230608' into for-next-20230608) 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 (7d0ec2a3cdc5 smb: remove obsolete comment) 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 (a811aa4333eb Merge fixes for quota issues found by syzbot.) Merging ext4/dev (571bc93d3e2e ext4: Give symbolic names to mballoc criterias) Merging f2fs/dev (81deabbb536c f2fs: avoid dead loop in f2fs_issue_checkpoint()) 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 (f9da18cd4616 gfs2: Don't remember delete unless it's successful) Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative) Merging ksmbd/ksmbd-for-next (a55d20f1379e 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 (ab83e9c0df5d NFSD: Add "official" reviewers for this subsystem) 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 (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up) 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 (7d6f61ae0354 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 (f9dae2af6f94 Merge branch 'pci/controller/endpoint') Merging pstore/for-next/pstore (48f2c681df43 pstore/ram: Convert to platform remove callback returning void) Merging hid/for-next (50d4bb8fd046 Merge branch 'for-6.5/core' into for-next) Merging i2c/i2c/for-next (e2335485204b Merge branch 'i2c/for-mergewindow' 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 (317840cfd665 hwmon: (it87) Generalise support for FAN_CTL ON/OFF) Merging jc_docs/docs-next (a1d2c9b3029d docs: process: fix a typoed cross-reference) Merging v4l-dvb/master (a23a3041c733 Merge tag 'v6.4-rc2' into media_stage) Merging v4l-dvb-next/master (aafeeaf3d2a8 media: video-mux: update driver to active state) Merging pm/linux-next (e8195eaff86f Merge branches 'acpi-pm', 'acpi-scan', 'acpi-tables', 'acpi-apei' and '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 (8c1ee346da58 RDMA/bnxt_re: Remove unnecessary checks) Merging net-next/main (392c108bce6e Merge branch 'tools-ynl-generate-code-for-the-devlink-family') CONFLICT (content): Merge conflict in fs/netfs/iterator.c Applying: fix up for "Move netfs_extract_iter_to_sg() to lib/scatterlist.c" Merging bpf-next/for-next (67faabbde36b selftests/bpf: Add missing prototypes for several test kfuncs) Merging ipsec-next/master (b2cbac9b9b28 net: Remove low_thresh in ip defrag) 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 Merging wireless-next/for-next (fef0f427f712 wifi: rtlwifi: remove misused flag from HAL data) 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 (a2c2690f0d74 mtd: st_spi_fsm: Use the devm_clk_get_enabled() helper function) Merging nand/nand/next (ef1560b670bd mtd: spinand: gigadevice: add support for GD5F2GQ5xExxH) Merging spi-nor/spi-nor/next (df6def86b9dc mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt) Merging crypto/master (134e0dc6b73a crypto: qat - add missing function declaration in adf_dbgfs.h) Merging drm/drm-next (2e1492835e43 Merge tag 'drm-misc-next-2023-06-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) Merging drm-misc/for-linux-next (c2807ecb5290 drm/omap: Convert to platform remove callback returning void) Merging amdgpu/drm-next (11007d925963 drm/amdgpu: Wrap -Wunused-but-set-variable in cc-option) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v9_0.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 (3fecd469da9a drm/i915: re-enable -Wunused-but-set-variable) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) Merging drm-msm/msm-next (ac7e7c9c65ec drm/msm/dpu: drop unused macros from hw catalog) Merging drm-msm-lumag/msm-next-lumag (6dd3d9d17a88 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi' and 'msm-next-lumag-mdp5' 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 (469859394c49 Merge remote-tracking branch 'regmap/for-6.5' into regmap-next) Merging sound/for-next (10b98a4db11a selftests: ALSA: Add test for the 'pcmtest' driver) 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 (50bd6809985a 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 (f3e6f4e23cc8 Merge branch 'for-6.5/io_uring' into for-next) Merging device-mapper/for-next (38d11da522aa dm: don't lock fs when the map is NULL in process of resume) Merging libata/for-next (371b74c8ba8f ata: libata-sata: Simplify ata_change_queue_depth()) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) Merging mmc/next (364dae3e80a4 mmc: mtk-sd: reduce CIT for better performance) $ git reset --hard HEAD^ Merging next-20230608 version of mmc Merging mfd/for-mfd-next (317fbd44923a mfd: tps65219: Add GPIO cell instance) Merging backlight/for-backlight-next (a8b09e6fe3ee dt-bindings: backlight: pwm: Make power-supply not required) Merging battery/for-next (8648aeb5d7b7 power: supply: add Qualcomm PMI8998 SMB2 Charger driver) Merging regulator/for-next (222466921b08 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 (c96a8a8c021b apparmor: aa_buffer: Convert 1-element array to flexible array) 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 (224541f80952 integrity: Enforce digitalSignature usage in the ima and evm keyrings) 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 (d11370bf64c5 Merge branches 'iommu/fixes', 'ppc/pamu', 'virtio', 'x86/amd' and 'core' into next) Merging audit/next (e455ca40dbcf audit: avoid missing-prototype warnings) Merging devicetree/for-next (d09294909c87 dt-bindings: imxgpt: add imx6ul compatible) 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 (6d8416140118 Merge branch into tip/master: 'x86/irq') 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 (0a81fa5d74cd Merge ras/edac-misc 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 (775ebf7b2bb1 torture: Add "--no-" as synonym for "--do-no-" in torture.sh) 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 (183b1c335718 s390/uv: Update query for secret-UVCs) 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 (e64c82b80641 ipmi: Switch i2c drivers back to use .probe()) 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 (033c2d8ab283 thunderbolt: Log DisplayPort adapter rate and lanes on discovery) 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 (ab5ca6268afc coresight: etm4x: Match all ETM4 instances based on DEVARCH and DEVTYPE) 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 (63cf621fde8c Merge branch 'icc-qos' into icc-next) Merging iio/togreg (12a875055c15 iio: temperature: tmp006: Add OF device matching support) 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 (bcfa8e33064f extcon: Switch i2c drivers back to use .probe()) 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 (f32b14ba70a9 Merge branch 'for-6.4-fixes' 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 (166025edd530 vdpa/mlx5: Support interrupt bypassing) 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 (be6736cc5423 gpiolib: demote the hogging log messages to debug) Merging gpio-intel/for-next (ac9a78681b92 Linux 6.4-rc1) Merging pinctrl/for-next (4ab0b8b35718 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (34ce984c24e6 pinctrl: intel: Add Intel Meteor Lake-S pin controller support) 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 (d909ae0a8562 kselftests: Sort the collections list to avoid duplicate tests) 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 (a196d7ad4ca5 bus: mhi: host: pci_generic: Add support for IP_SW0 channels) 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) 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 (9561de3a55be Linux 6.4-rc5) Merging rust/rust-next (d09a61024f6b rust: task: add `Send` marker to `Task`) 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 (4cac30138e5e media: venus: hfi_cmds: Replace fake flex-arrays with flexible-array members) Merging iommufd/for-next (f1fcbaa18b28 Linux 6.4-rc2)
Attachment:
pgpmRTeWwdplh.pgp
Description: OpenPGP digital signature
