Hi all, Changes since 20230518: The net tree lost its build failure. The mm tree lost its build failure but gained another for which I applied a patch. The amdgpu tree gained a build failure so I used the version from next-20230518. The rcu tree gained a build failure so I used the version from next-20230518. Non-merge commits (relative to Linus' tree): 2802 3540 files changed, 102771 insertions(+), 44486 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 (2d1bcbc6cd70 Merge tag 'probes-fixes-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging mm-hotfixes/mm-hotfixes-unstable (c9471df7142d decompressor: provide missing prototypes) CONFLICT (content): Merge conflict in MAINTAINERS 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 (fd2d1cb8c545 arm64: Make the ARCH_FORCE_MAX_ORDER config input prompt unconditional) Merging arm-soc-fixes/arm/fixes (d75eecc3d170 Merge tag 'qcom-arm64-fixes-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/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 (aaee8c7f2a17 m68k: kexec: Include <linux/reboot.h>) Merging powerpc-fixes/fixes (1f7aacc5eb9e powerpc/iommu: Incorrect DDW Table is referenced for SR-IOV device) Merging s390-fixes/fixes (0f1cbf941d59 s390/iommu: get rid of S390_CCW_IOMMU and S390_AP_IOMMU) 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 (1f594fe7c907 Merge tag 'net-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (a820ca1a739b samples/bpf: Drop unnecessary fallthrough) Merging ipsec/master (8680407b6f8f xfrm: Check if_id in inbound policy/secpath match) 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 (61ae320a29b0 netfilter: nft_set_rbtree: fix null deref on element insertion) Merging wireless/for-next (212457ccbd60 wifi: b43: fix incorrect __packed annotation) Merging wpan/master (bd4e3d82f4cc MAINTAINERS: Add wpan patchwork) Merging rdma-fixes/for-rc (866422cdddcd RDMA/efa: Fix unsupported page sizes in device) Merging sound-current/for-linus (dc4f2ccaeddd ALSA: hda: Add NVIDIA codec IDs a3 through a7 to patch table) Merging sound-asoc-fixes/for-linus (e123036be377 ASoC: soc-pcm: test if a BE can be prepared) Merging regmap-fixes/for-linus (3981514180c9 regmap: Account for register length when chunking) Merging regulator-fixes/for-linus (a511637502b1 regulator: mt6359: add read check for PMIC MT6359) Merging spi-fixes/for-linus (445164e8c136 spi: dw: Replace spi->chip_select references with function calls) Merging pci-current/for-linus (3b8803494a06 PCI/DPC: Quirk PIO log size for Intel Ice Lake Root Ports) Merging driver-core.current/driver-core-linus (f1fcbaa18b28 Linux 6.4-rc2) Merging tty.current/tty-linus (8fb9ea65c9d1 vc_screen: reload load of struct vc_data pointer in vcs_write() to avoid UAF) Merging usb.current/usb-linus (1e94be78ec15 Merge tag 'thunderbolt-for-v6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus) Merging usb-serial-fixes/usb-linus (09a9639e56c0 Linux 6.3-rc6) 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 (55720d242052 dt-bindings: iio: adc: renesas,rcar-gyroadc: Fix adi,ad7476 compatible value) Merging counter-current/counter-current (ac9a78681b92 Linux 6.4-rc1) Merging char-misc.current/char-misc-linus (0fa53349c3ac binder: add lockless binder_alloc_(set|get)_vma()) Merging soundwire-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging thunderbolt-fixes/fixes (c4af8e3fecd0 thunderbolt: Clear registers properly when auto clear isn't in use) Merging input-current/for-linus (7b63a88bb62b Input: psmouse - fix OOB access in Elantech protocol) Merging crypto-current/master (b8969a1b6967 crypto: api - Fix CRYPTO_USER checks for report function) Merging vfio-fixes/for-linus (4928f67bc911 vfio/mlx5: Fix the report of dirty_bytes upon pre-copy) 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 (38de368a6636 dmaengine: ti: k3-udma: annotate pm function with __maybe_unused) Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) Merging mtd-fixes/mtd/fixes (93942b704615 mtd: rawnand: meson: fix bitmask for length in command word) Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) Merging v4l-dvb-fixes/fixes (8c1688e897a6 Merge tag 'v6.4-rc2' into v4l_for_linus) Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) Merging mips-fixes/mips-fixes (ac9a78681b92 Linux 6.4-rc1) Merging at91-fixes/at91-fixes (fe15c26ee26e Linux 6.3-rc1) Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) Merging kvm-fixes/master (39428f6ea9ea Merge tag 'kvmarm-fixes-6.4-1' 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 (ac9a78681b92 Linux 6.4-rc1) Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE) Merging cxl-fixes/fixes (764d102ef94e cxl: Add missing return to cdat read error path) Merging btrfs-fixes/next-fixes (7f6d8752b79e 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 (95e4b25192e9 platform/mellanox: mlxbf-pmc: fix sscanf() error checking) 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 (6997f847cbb7 MAINTAINERS: add Conor as a dt-bindings maintainer) Merging dt-krzk-fixes/fixes (8bbec86ce6d6 dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning) Merging scsi-fixes/fixes (09e797c8641f scsi: core: Decrease scsi_device's iorequest_cnt if dispatch failed) Merging drm-fixes/drm-fixes (f1fcbaa18b28 Linux 6.4-rc2) Merging drm-intel-fixes/for-linux-next-fixes (5896f2d363d5 drm/i915/hdcp: Check if media_gt exists) Merging mmc-fixes/fixes (81dce1490e28 mmc: sdhci-esdhc-imx: make "no-mmc-hs400" works) Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1) 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 (3b90b09af5be riscv: Fix orphan section warnings caused by kernel/pi) 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 (3c66c757bfb1 dt-bindings: fpga: replace Ivan Bornyakov maintainership) CONFLICT (content): Merge conflict in MAINTAINERS Merging spdx/spdx-linus (ac9a78681b92 Linux 6.4-rc1) Merging gpio-brgl-fixes/gpio/for-current (7dd3d9bd873f gpiolib: fix allocation of mixed dynamic/static GPIOs) Merging gpio-intel-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging pinctrl-intel-fixes/fixes (f1fcbaa18b28 Linux 6.4-rc2) Merging erofs-fixes/fixes (3b35f11c99e1 erofs: avoid pcpubuf.c inclusion if CONFIG_EROFS_FS_ZIP is off) 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 (8ae72e5fd95a nfsd: make a copy of struct iattr before calling notify_change) Merging irqchip-fixes/irq/irqchip-fixes (cddb536a73ef irqchip/mbigen: Unify the error handling in mbigen_of_create_domain()) 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 (1b5f159ce875 tools headers disabled-features: Sync with the kernel sources) Merging efi-fixes/urgent (0b1d9debe303 efi/libstub: randomalloc: Return EFI_OUT_OF_RESOURCES on failure) 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 (1aa7f4161756 drm: panel-orientation-quirks: Change Air's quirk to support Air Plus) Merging mm-stable/mm-stable (ac9a78681b92 Linux 6.4-rc1) Merging mm-nonmm-stable/mm-nonmm-stable (ac9a78681b92 Linux 6.4-rc1) Merging mm/mm-everything (5a8047c0febe Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (f1fcbaa18b28 Linux 6.4-rc2) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf-tools-next (c0d68601cbce perf test: Add cputype testing to perf stat) Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2) Merging dma-mapping/for-next (ec274aff21b6 swiotlb: Omit total_used and used_hiwater if !CONFIG_DEBUG_FS) Merging asm-generic/master (f1fcbaa18b28 Linux 6.4-rc2) 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 (0fddb79bf283 arm64: lds: move .got section out of .text) Merging arm-perf/for-next/perf (257aedb72e73 drivers/perf: hisi: add NULL check for name) Merging arm-soc/for-next (8ecfe9a0e657 soc: document merges) Merging amlogic/for-next (0618cb14da6a Merge branch 'v6.5/arm-dt' into for-next) Merging asahi-soc/asahi-soc/for-next (f41aba157819 Merge branch 'asahi-soc/dt' into asahi-soc/for-next) Merging aspeed/for-next (7d4f0b0df7c5 ARM: dts: aspeed-g6: Add UDMA node) Merging at91/at91-next (ad5125686a4f Merge branch 'at91-dt' into at91-next) Merging broadcom/next (bba5ad8482de Merge branch 'devicetree/next' into next) Merging davinci/davinci/for-next (ac9a78681b92 Linux 6.4-rc1) Merging drivers-memory/for-next (3d56c7364389 memory: renesas-rpc-if: Fix PHYCNT.STRTIM setting) Merging imx-mxs/for-next (efdde75fee54 Merge branch 'imx/defconfig' into for-next) Merging mediatek/for-next (e586dd447172 Merge branch 'v6.3-next/soc' into for-next) Merging mvebu/for-next (64687391f64d Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (c45167f4f5cf Merge branch 'omap-for-v6.4/dt' into for-next) Merging qcom/for-next (4272e06e19f3 Merge branches 'arm64-defconfig-for-6.5', 'arm64-fixes-for-6.4', 'arm64-for-6.5', 'drivers-fixes-for-6.4' and 'drivers-for-6.5' into for-next) Merging renesas/next (21330625d0f5 Merge branches 'renesas-arm-defconfig-for-v6.5' and 'renesas-drivers-for-v6.5' into renesas-next) Merging reset/reset/next (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS) Merging rockchip/for-next (e11ff0914d61 Merge branch 'v6.5-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (5b248db78d1a Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (e06854e84add Merge tags 'scmi-fix-6.4', 'juno-fixes-6.4' and 'ffa-fixes-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (3b1583868691 ARM: dts: stm32: fix m4_rproc references to use SCMI for stm32mp15) Merging sunxi/sunxi/for-next (7554aa0897a3 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 (d52733725601 Merge branch for-6.5/arm64/dt into for-next) Merging ti/ti-next (6bb0b834e3c2 Merge branch 'ti-drivers-soc-next' into ti-next) Merging xilinx/for-next (12ac543351cc Merge branch 'zynqmp/dt' 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 (7f91fe3a71aa clk: renesas: r8a779a0: Add PWM clock) 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 (f1fcbaa18b28 Linux 6.4-rc2) Merging m68k/for-next (4decdb267a47 nubus: Remove proc entries before adding them) Merging m68knommu/for-next (f1fcbaa18b28 Linux 6.4-rc2) Merging microblaze/next (fe15c26ee26e Linux 6.3-rc1) Merging mips/mips-next (ac9a78681b92 Linux 6.4-rc1) Merging openrisc/for-next (c91b4a07655d openrisc: Add floating point regset) Merging parisc-hd/for-next (7ee7b97c4007 parisc: Flush gatt writes and adjust gatt mask in parisc_agp_mask_memory()) Merging powerpc/next (f1fcbaa18b28 Linux 6.4-rc2) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (ac9a78681b92 Linux 6.4-rc1) Merging riscv-dt/riscv-dt-for-next (6361b7de262a riscv: dts: starfive: jh7110: Add watchdog node) Merging riscv-soc/riscv-soc-for-next (ac9a78681b92 Linux 6.4-rc1) Merging s390/for-next (00e1d14a1eab 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 (ad0ff58dc959 pid: Replace struct pid 1-element array with flex-array) Merging vfs-idmapping/for-next (ac9a78681b92 Linux 6.4-rc1) Merging fscrypt/for-next (83e57e47906c fscrypt: optimize fscrypt_initialize()) 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 (d3f0936c54ee Merge branch 'for-next-next-v6.4-20230517' into for-next-20230517) Merging ceph/master (4cafd0400bcb ceph: force updating the msg pointer in non-split case) Merging cifs/for-next (59a556aebc43 SMB3: drop reference to cfile before sending oplock break) Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) Merging erofs/dev (ac9a78681b92 Linux 6.4-rc1) Merging exfat/dev (fe15c26ee26e Linux 6.3-rc1) Merging ext3/for_next (df9c5af6a4ef Merge ext2 direct IO conversion to iomap.) Merging ext4/dev (2a534e1d0d15 ext4: bail out of ext4_xattr_ibody_get() fails for any reason) Merging f2fs/dev (a4ebabf341d9 f2fs: renew value of F2FS_FEATURE_*) Merging fsverity/for-next (e08e901faa8f fsverity: use shash API instead of ahash API) Merging fuse/for-next (c68ea140050e fuse: remove duplicate check for nodeid) Merging gfs2/for-next (6ddd5e9eaadf 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 (e7b8b8ed9960 ksmbd: smb2: Allow messages padded to 8byte boundary) Merging nfs/linux-next (e8d018dd0257 Linux 6.3-rc3) Merging nfs-anna/linux-next (fbd2a05f29a9 NFSv4.2: Rework scratch handling for READ_PLUS) Merging nfsd/nfsd-next (16d592dccd99 NFSD: Replace encode_cinfo()) 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 (2254a7396a0c xfs: fix xfs_inodegc_stop racing with mod_delayed_work) Merging zonefs/for-next (2b188a2cfc4d zonefs: make kobj_type structure constant) 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/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 (174977dc80b7 Merge branch 'pci/controller/vmd') Merging pstore/for-next/pstore (48f2c681df43 pstore/ram: Convert to platform remove callback returning void) Merging hid/for-next (d777b19c6356 Merge branch 'for-6.4/amd-sfh' into for-next) Merging i2c/i2c/for-next (03230ddddf9d Merge branch 'i2c/for-current' into i2c/for-next) Merging i3c/i3c/next (6b496a94c590 i3c: ast2600: set variable ast2600_i3c_ops storage-class-specifier to static) Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) Merging hwmon-staging/hwmon-next (92613681c009 Documentation/hwmon: Move misplaced entry in hwmon docs index) Merging jc_docs/docs-next (bd415b5c9552 Documentation/filesystems: ramfs-rootfs-initramfs: use :Author:) Merging v4l-dvb/master (a23a3041c733 Merge tag 'v6.4-rc2' into media_stage) Merging v4l-dvb-next/master (382ce82fe2b1 media: v4l2-subdev.h: document client_caps at struct v4l2_subdev_fh) Merging pm/linux-next (150ab364fade Merge branch 'acpi-x86' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (11a3b0ac33d9 cpufreq: imx6q: don't warn for disabling a non-existing frequency) Merging cpupower/cpupower (c2adb1877b76 cpupower: Make TSC read per CPU for Mperf monitor) Merging devfreq/devfreq-next (376b1446153c PM / devfreq: exynos-ppmu: Use devm_platform_get_and_ioremap_resource()) Merging opp/opp/linux-next (ac9a78681b92 Linux 6.4-rc1) Merging thermal/thermal/linux-next (2afa82d1fc64 dt-bindings: thermal: qcom-tsens: Correct unit address) Merging dlm/next (7a40f1f18a88 fs: dlm: stop unnecessarily filling zero ms_extra bytes) Merging rdma/for-next (f1fcbaa18b28 Linux 6.4-rc2) Merging net-next/main (90223c1136b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf-next/for-next (effcf6241624 selftests/bpf: Make bpf_dynptr_is_rdonly() prototyype consistent with kernel) 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 (e641577eb6e8 Merge branch 'spdx-conversion-for-bonding-8390-and-i825xx-drivers') Merging bluetooth/master (78c8f6e2d7d7 Bluetooth: btnxpuart: Fix compiler warnings) Merging wireless-next/for-next (156d30084295 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging wpan-next/master (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited) Merging wpan-staging/staging (1af3de62f03f ieee802154: ca8210: Flag the driver as being limited) Merging mtd/mtd/next (7227aacb62ae Merge tag 'nand/for-6.4' into mtd/next) Merging nand/nand/next (ec185b18c223 mtd: nand: Convert to platform remove callback returning void) Merging spi-nor/spi-nor/next (df6def86b9dc mtd: spi-nor: spansion: Add support for s25hl02gt and s25hs02gt) Merging crypto/master (ac52578d6e8d hwrng: virtio - Fix race on data_avail and actual data) Merging drm/drm-next (f1fcbaa18b28 Linux 6.4-rc2) Merging drm-misc/for-linux-next (20d54e48d9c7 fbdev: Rename fb_mem*() helpers) CONFLICT (content): Merge conflict in drivers/video/fbdev/stifb.c Merging amdgpu/drm-next (08cd5509cc7d drm/amdkfd: fix stack size in svm_range_validate_and_map) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.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 include/drm/display/drm_dp.h $ git reset --hard HEAD^ Merging next-20230518 version of amdgpu 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 include/drm/display/drm_dp.h [master 8901abddb664] next-20230518/amdgpu Merging drm-intel/for-linux-next (615ed9ece018 drm/i915/mtl: Fix expected reg value for Thunderbolt PLL disabling) 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 (ac7e7c9c65ec drm/msm/dpu: drop unused macros from hw catalog) 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 (ac9a78681b92 Linux 6.4-rc1) Merging regmap/for-next (a90f704faaf2 Merge remote-tracking branch 'regmap/for-6.5' into regmap-next) Merging sound/for-next (82a9fa6e9e3c ALSA: emu10k1: make freeing untouched playback voices cheap) Merging ieee1394/for-next (ac9a78681b92 Linux 6.4-rc1) Merging sound-asoc/for-next (8bf890c7db44 Merge remote-tracking branch 'asoc/for-6.5' into asoc-next) CONFLICT (content): Merge conflict in MAINTAINERS Merging modules/modules-next (0b891c83d8c5 module: include internal.h in module/dups.c) Merging input/next (f219050af06d Input: libps2 - do not discard non-ack bytes when controlling LEDs) Merging block/for-next (617bfe921735 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 (f19c694f744f ata: pata_parport: Fix frpw module code indentation and style) Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) Merging mmc/next (d4ebc9419afb Merge branch 'fixes' into next) Merging mfd/for-mfd-next (9bdc4322bbd1 mfd: Remove redundant dev_set_drvdata() from I2C drivers) Merging backlight/for-backlight-next (fb200218b40b backlight: as3711: Use of_property_read_bool() for boolean properties) Merging battery/for-next (eae36cb82440 power: reset: add HAS_IOPORT dependencies) Merging regulator/for-next (819f6bc03c1f Merge remote-tracking branch 'regulator/for-6.5' into regulator-next) Merging security/next (ac9a78681b92 Linux 6.4-rc1) Merging apparmor/apparmor-next (0bb84cff96af apparmor: fix missing error check for rhashtable_insert_fast) Merging integrity/next-integrity (644f17412f5a IMA: allow/fix UML builds) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (eb14232fb771 selinux: make header files self-including) 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 (2d1bcbc6cd70 Merge tag 'probes-fixes-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) 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 (e51b4198396c Merge branches 'iommu/fixes', 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/omap', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 'unisoc', 'x86/vt-d', 'x86/amd', 'core' and 'platform-remove_new' into next) Merging audit/next (e455ca40dbcf audit: avoid missing-prototype warnings) Merging devicetree/for-next (c50eb01940c7 Merge branch 'dt/address-cleanups' into dt/next) Merging dt-krzk/for-next (0ff3c07556e6 Merge branch 'next/dt64' into for-next) Merging mailbox/mailbox-for-next (d396133dced4 dt-bindings: mailbox: qcom: add compatible for IPQ9574 SoC) Merging spi/for-next (b1f4091a9eff Merge remote-tracking branch 'spi/for-6.5' into spi-next) Merging tip/master (f81d8f759e7f Merge x86/cpu into tip/master) 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 Merging clockevents/timers/drivers/next (158009f1b4a3 timekeeping: Fix references to nonexistent ktime_get_fast_ns()) Merging edac/edac-for-next (6c79e42169fe EDAC/amd64: Add support for ECC on family 19h model 60h-7Fh) Merging irqchip/irq/irqchip-next (2ff1b0839ddd Merge branch irq/misc-6.4 into irq/irqchip-next) Merging ftrace/for-next (3862f86c1529 Merge tools/for-next) Merging rcu/rcu/next (9bb839a83e1b rcuscale: Measure grace-period kthread CPU time) Applying: fixup for "RDMA/rxe: Add error messages" $ git reset --hard HEAD^ Merging next-20230518 version of rcu Applying: fixup for "RDMA/rxe: Add error messages" [master d533ef7aa140] next-20230518/rcu 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 (6338b7e2e9d2 Merge branch kvm-arm64/eager-page-splitting into kvmarm/next) Merging kvms390/next (8a46df7cd135 KVM: s390: pci: fix virtual-physical confusion on module unload/load) Merging kvm-riscv/riscv_kvm_next (2f4d58f7635a RISC-V: KVM: Virtualize per-HART AIA CSRs) Merging kvm-x86/next (5c291b93e5d6 Merge branch 'pmu') Merging xen-tip/linux-next (cbfac7707ba1 xen/blkback: move blkif_get_x86_*_req() into blkback.c) Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) Merging workqueues/for-next (42ec3d6cd4a8 Merge branch 'for-6.5-cleanup-ordered' into for-next) Merging drivers-x86/for-next (f5a08ed51ed7 platform/x86: toshiba: constify pointers to hwmon_channel_info) Merging chrome-platform/for-next (ac9a78681b92 Linux 6.4-rc1) Merging hsi/for-next (ac9a78681b92 Linux 6.4-rc1) Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) Merging leds-lj/for-leds-next (7a9496d0feb5 dt-bindings: leds: Drop redundant cpus enum match) Merging ipmi/for-next (9930702cfebb ipmi_watchdog: Fix read syscall not responding to signals during sleep) Merging driver-core/driver-core-next (f1fcbaa18b28 Linux 6.4-rc2) Merging usb/usb-next (a4422ff22142 usb: typec: qcom: Add Qualcomm PMIC Type-C driver) CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/core.c Merging thunderbolt/next (f1fcbaa18b28 Linux 6.4-rc2) Merging usb-serial/usb-next (a095edfc15f0 USB: serial: option: add UNISOC vendor and TOZED LT70C product) Merging tty/tty-next (d5b3d02d0b10 serial: Make uart_remove_one_port() return void) Merging char-misc/char-misc-next (c21c0f9a20a9 Binder: Add async from to transaction record) Merging accel/habanalabs-next (58d6ab5a4d68 accel/habanalabs: mask part of hmmu page fault captured address) Merging coresight/next (18996a113f25 coresight: etm_pmu: Set the module field) Merging fastrpc/for-next (3f6b4c6f0bd0 fastrpc: Don't assert held reservation lock for dma-buf mmapping) Merging fpga/for-next (da4da5b2d708 fpga: dfl-fme: constify pointers to hwmon_channel_info) Merging icc/icc-next (b4d0d66dabe9 Merge branch 'icc-cbf' into icc-next) Merging iio/togreg (a508fbfed333 iio: kx022a: Probe asynchronously) Merging phy-next/next (8d087a09c701 phy: ti: gmii-sel: Enable USXGMII mode for J784S4) Merging soundwire/next (9420c9719f03 soundwire: bus: Don't filter slave alerts) Merging extcon/extcon-next (4e30418def07 extcon: Drop unneeded assignments) CONFLICT (content): Merge conflict in drivers/extcon/extcon.c Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1) Merging vfio/next (705b004ee377 docs: kvm: vfio: Suggest KVM_DEV_VFIO_GROUP_ADD vs VFIO_GROUP_GET_DEVICE_FD ordering) Merging w1/for-next (b332af5398a3 w1: Replace usage of found with dedicated list iterator variable) Merging staging/staging-next (1f3413dc8eb0 staging: rtl8192e: Refactor tmp_ofdm_index variable assignment) Merging counter-next/counter-next (228354ed692f tools/counter: Makefile: Remove lingering 'include' directories on make clean) Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) Merging dmaengine/next (2437d5ea2191 dmaengine: make QCOM_HIDMA depend on HAS_IOMEM) Merging cgroup/for-next (2ef269ef1ac0 cgroup/cpuset: Free DL BW in case can_attach() fails) Merging scsi/for-next (d8975ee303e6 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (16853cd8f6d4 scsi: dc395x: Documentation: Reword original driver attribution) Merging vhost/linux-next (ebddc00f450d vhost_net: revert upend_idx only on retriable error) Merging rpmsg/for-next (de598695a2ad remoteproc: stm32: Allow hold boot management by the SCMI reset controller) Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1) Merging gpio-brgl/gpio/for-next (2c99754ea0f9 gpio: add HAS_IOPORT dependencies) Merging gpio-intel/for-next (782eea0c89f7 gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU) Merging pinctrl/for-next (4ca235d2898e Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (f1fcbaa18b28 Linux 6.4-rc2) 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 (3ecb4a459a1e selftests/ftrace: Add new test case which checks for optimized probes) Merging kunit/test (ac9a78681b92 Linux 6.4-rc1) Merging kunit-next/kunit (a5ce66ad292b kunit: example: Provide example exit functions) Merging livepatching/for-next (5e36be5973b6 Merge branch 'for-6.4/core' into for-next) Merging rtc/rtc-next (e99ab4abebf8 rtc: armada38x: use devm_platform_ioremap_resource_byname()) 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 (ac9a78681b92 Linux 6.4-rc1) 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 (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) 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 (1d1493bdc25f bus: mhi: host: Use mhi_tryset_pm_state() for setting fw error state) Merging memblock/for-next (e4bfeb6d6f39 Fix some coding style errors in memblock.c) Merging cxl/next (bfe58458fd25 cxl/mbox: Update CMD_RC_TABLE) Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) Merging efi/next (d86ff3333cb1 efivarfs: expose used and total size) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (ed4cdfbeb873 Merge branch 'slab/for-6.4/slob-removal' 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 (ed35e2f2f0de landlock: Clarify documentation for the LANDLOCK_ACCESS_FS_REFER right) Merging rust/rust-next (ac9a78681b92 Linux 6.4-rc1) Merging sysctl/sysctl-next (1685b445d778 sysctl: stop exporting register_sysctl_table) Merging execve/for-next/execve (60592fb6b67c coredump, vmcore: Set p_align to 4 for PT_NOTE) 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 (55c84a5cf2c7 fortify: strcat: Move definition to use fortified strlcat()) Merging kspp-gustavo/for-next/kspp (00168b415a60 uapi: net: ipv6: Replace fake flex-array with flex-array member) Merging iommufd/for-next (f1fcbaa18b28 Linux 6.4-rc2) Applying: fix up for "init: consolidate prototypes in linux/init.h"
Attachment:
pgpi7TppNd6tE.pgp
Description: OpenPGP digital signature
