Hi all, Changes since 20230512: New trees: fastrpc, wpan-staging The mm-hotfixes tree gained a conflict against Linus' tree. The drm-misc tree gained a conflict against Linus' tree. The amdgpu tree gained a conflict against the drm-misc tree. The sound-asoc tree gained a conflict against Linus' tree and a build failure, so I used the version from next-20230512. The usb tree gained conflicts against the usb.current tree. Non-merge commits (relative to Linus' tree): 1956 2351 files changed, 58055 insertions(+), 21456 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 (f1fcbaa18b28 Linux 6.4-rc2) Merging fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging mm-hotfixes/mm-hotfixes-unstable (249c179b1a4c MAINTAINERS: Cleanup Arm Display IP maintainers) CONFLICT (content): Merge conflict in MAINTAINERS Merging kbuild-current/fixes (58390c8ce1bd Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) 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 (32d859996806 arm64: compat: Work around uninitialized variable warning) 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 (66b2ca086210 powerpc/64s/radix: Fix soft dirty tracking) Merging s390-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) Merging net/main (b41caaded077 Merge branch 'hns3-fixes') Merging bpf/master (5f5486b620cd selftests/bpf: Fix pkg-config call building sign-file) 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 (3acf8f6c14d0 selftests: nft_flowtable.sh: check ingress/egress chain too) Merging wireless/for-next (bcafcb959a57 wifi: rtw88: use work to update rate to avoid RCU warning) Merging wpan/master (bd4e3d82f4cc MAINTAINERS: Add wpan patchwork) Merging rdma-fixes/for-rc (78b6a9a3f445 MAINTAINERS: Update maintainers of HiSilicon RoCE) Merging sound-current/for-linus (9dc68a4fe708 ALSA: hda/realtek: Fix mute and micmute LEDs for yet another HP laptop) Merging sound-asoc-fixes/for-linus (f63550e2b165 ASoC: ssm2602: Add workaround for playback distortions) Merging regmap-fixes/for-linus (70a640c0efa7 regmap: REGMAP_KUNIT should not select REGMAP) Merging regulator-fixes/for-linus (ac9a78681b92 Linux 6.4-rc1) Merging spi-fixes/for-linus (4c329f5da7cf spi: spi-geni-qcom: Select FIFO mode for chip select) 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 (ac9a78681b92 Linux 6.4-rc1) 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 (a398d5eac698 usb-storage: fix deadlock when a scsi command timeouts more than once) Merging usb-serial-fixes/usb-linus (09a9639e56c0 Linux 6.3-rc6) Merging phy/fixes (e42f110700ed phy: qcom-qmp-pcie-msm8996: fix init-count imbalance) 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 (d7eafa64a158 tools/nolibc: Fix build of stdio.h due to header ordering) Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) Merging dmaengine-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) 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 (280a8ab81733 media: dvb-core: Fix use-after-free due to race condition at dvb_ca_en50221) 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 (1a5304fecee5 Merge tag 'parisc-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) 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 (a9b282be7894 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 (3d43f9f63954 platform/mellanox: fix potential race in mlxbf-tmfifo driver) 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 (1a7edd041f2d scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend) Merging drm-fixes/drm-fixes (d8843eebbbd1 Merge tag 'amd-drm-fixes-6.4-2023-05-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (79c901c93562 drm/i915: taint kernel when force probing unsupported devices) 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 (976d3c6778e9 selftests: gpio: gpio-sim: Fix BUG: test FAILED due to recent change) Merging gpio-intel-fixes/fixes (fe15c26ee26e Linux 6.3-rc1) Merging pinctrl-intel-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) Merging erofs-fixes/fixes (ac9a78681b92 Linux 6.4-rc1) 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 (07a273059385 SUNRPC: Fix trace_svc_register() call site) Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) 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 (760ebc45746b perf lock contention: Add empty 'struct rq' to satisfy libbpf 'runqueue' type verification) 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 (bc97139ff135 power: supply: rt9467: Fix passing zero to 'dev_err_probe') 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 (ac9a78681b92 Linux 6.4-rc1) 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 (50282fd57bcd Merge drm/drm-fixes into drm-misc-fixes) 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 (af7f872bc49a Merge branch 'mm-nonmm-unstable' into mm-everything) Merging kbuild/for-next (47a2ee5d4a0b Merge tag 'firewire-fixes-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf-tools-next (5d27a645f609 perf tracepoint: Fix memory leak in is_valid_tracepoint()) 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 (5e98654e30e1 Merge branch 'asm-generic-fixes' 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 (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 (8325d05da476 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 (5668d088ee4e ARM: dts: kirkwood: Add Endian 4i Edge 200 board) Merging omap/for-next (c45167f4f5cf Merge branch 'omap-for-v6.4/dt' into for-next) Merging qcom/for-next (ac9a78681b92 Linux 6.4-rc1) Merging renesas/next (be43a9462ec2 Merge branch 'renesas-dts-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 (ac9a78681b92 Linux 6.4-rc1) Merging sunxi/sunxi/for-next (7081db38231a Merge branch 'sunxi/dt-for-6.4' into sunxi/for-next) Merging tee/next (86dfcfab4fe0 Merge branch 'optee_fix_async_notif_for-v6.3' into next) Merging tegra/for-next (7947eeb21f00 Merge branch for-6.4/arm64/defconfig into for-next) Merging ti/ti-next (2aecef6d0e05 arm64: dts: ti: k3-am62x-sk-common: Add main_uart1 and wkup_uart nodes) Merging xilinx/for-next (958a4923d12b Merge branch 'zynqmp/soc' into for-next) Merging clk/clk-next (ac9a78681b92 Linux 6.4-rc1) Merging clk-imx/for-next (ac9a78681b92 Linux 6.4-rc1) 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 (2fa5ebe3bc4e tools/perf: Add basic support for LoongArch) Merging m68k/for-next (aaee8c7f2a17 m68k: kexec: Include <linux/reboot.h>) 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 (b645c02c3594 parisc: Allow 64-bit STI calls in PDC firmware abstration) Merging powerpc/next (3af77224c09d powerpc/spufs: remove unneeded if-checks) 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 (6a887bcc4138 riscv: dts: starfive: Add PMU controller node) Merging riscv-soc/riscv-soc-for-next (ac9a78681b92 Linux 6.4-rc1) Merging s390/for-next (de12921a1665 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 (ac9a78681b92 Linux 6.4-rc1) 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 (41262151275e Merge branch 'for-next-next-v6.4-20230515' into for-next-20230515) Merging ceph/master (a12e5342fa27 ceph: silence smatch warning in reconnect_caps_cb()) Merging cifs/for-next (f1fcbaa18b28 Linux 6.4-rc2) 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 (08c3eab525ef f2fs: remove some dead code) Merging fsverity/for-next (04839139213c fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds) Merging fuse/for-next (c68ea140050e fuse: remove duplicate check for nodeid) Merging gfs2/for-next (644f6bf762fa gfs2: gfs2_ail_empty_gl no log flush on error) Merging jfs/jfs-next (fad376fce0af fs/jfs: fix shift exponent db_agl2size negative) Merging ksmbd/ksmbd-for-next (10afeddd8aac 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 (58390c8ce1bd Merge tag 'iommu-updates-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) 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 (cdc822dda6f8 docs/sp_SP: Add translation of process/adding-syscalls) Merging v4l-dvb/master (ac9a78681b92 Linux 6.4-rc1) Merging v4l-dvb-next/master (a23a3041c733 Merge tag 'v6.4-rc2' into media_stage) Merging pm/linux-next (ac9a78681b92 Linux 6.4-rc1) Merging cpufreq-arm/cpufreq/arm/linux-next (dcfce7c2cee4 cpufreq: sparc: Don't allocate cpufreq_driver dynamically) 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 (ac9a78681b92 Linux 6.4-rc1) Merging net-next/main (befcc1fce564 sfc: fix use-after-free in efx_tc_flower_record_encap_match()) Merging bpf-next/for-next (79b3604d6221 Merge branch 'bpf: Don't EFAULT for {g,s}setsockopt with wrong optlen') Merging ipsec-next/master (f4796398f21b xfrm: Remove inner/outer modes from output path) 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 (ed23734c23d2 Merge tag 'net-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bluetooth/master (376b10586124 Bluetooth: btusb: Add device 6655:8771 to device tables) Merging wireless-next/for-next (8130e94e888b wifi: rtw89: suppress the log for specific SER called CMDPSR_FRZTO) 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 (ac9a78681b92 Linux 6.4-rc1) Merging drm-misc/for-linux-next (8bb7c7bca5b7 drm/panel: panel-simple: Add BOE EV121WXM-N10-1850 panel support) CONFLICT (content): Merge conflict in drivers/video/fbdev/stifb.c Merging amdgpu/drm-next (d3295311e589 drm/amdgpu/display: Enable DC_FP for LoongArch) 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 Merging drm-intel/for-linux-next (6e4e9fbd5ba0 drm/i915/gt: drop dependency on VLV_DISPLAY_BASE) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.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 (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 (7e5a77cccd1f Merge remote-tracking branch 'regmap/for-6.5' into regmap-next) Merging sound/for-next (59f038a09c62 ALSA: emu10k1: simplify tone control switch DSP code) Merging ieee1394/for-next (ac9a78681b92 Linux 6.4-rc1) Merging sound-asoc/for-next (af233bd2931b ASoC: Merge up fixes for CI) CONFLICT (content): Merge conflict in MAINTAINERS $ git reset --hard HEAD^ Merging next-20230512 version of sound-asoc Merging modules/modules-next (0b891c83d8c5 module: include internal.h in module/dups.c) Merging input/next (17caa38a988e dt-bindings: input: cypress,cyapa: convert to dtschema) Merging block/for-next (9a48d6046722 x86/retbleed: Fix return thunk alignment) Merging device-mapper/for-next (38d11da522aa dm: don't lock fs when the map is NULL in process of resume) Merging libata/for-next (140b26035b2d ata: pata_parport-bpck6: Declare mode_map as static) 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 (5a160ced6ceb 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 (67fce5963b20 power: supply: hwmon: constify pointers to hwmon_channel_info) Merging regulator/for-next (cf27b7d9a574 regulator: Add support for TPS6287x) 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 (c52df19e3759 selinux: small cleanups in selinux_audit_rule_init()) 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 (7c1a4441ddf1 tpm: Prevent hwrng from activating during resume) 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 (ac9a78681b92 Linux 6.4-rc1) Merging devicetree/for-next (c50eb01940c7 Merge branch 'dt/address-cleanups' into dt/next) Merging dt-krzk/for-next (072126e4f851 Merge branch 'next/qcom-pinctrl' into for-next) Merging mailbox/mailbox-for-next (d396133dced4 dt-bindings: mailbox: qcom: add compatible for IPQ9574 SoC) Merging spi/for-next (039fe6f7eb7d Merge remote-tracking branch 'spi/for-6.5' into spi-next) Merging tip/master (f585d5177e1a Merge x86/alternatives into tip/master) Merging clockevents/timers/drivers/next (158009f1b4a3 timekeeping: Fix references to nonexistent ktime_get_fast_ns()) Merging edac/edac-for-next (b34348a0d7c5 EDAC/amd64: Remove module version string) 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 (891518739670 Merge branch 'atomicdoc.2023.05.11a' into HEAD) Applying: fixup for "RDMA/rxe: Add error messages" Merging kvm/next (7a8016d95651 Merge tag 'kvm-s390-next-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-arm/next (74819ee73f1f Merge branch kvm-arm64/misc-6.4 into kvmarm-master/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 (4d19140f762c Merge branch 'for-6.5' into for-next) Merging drivers-x86/for-next (06ffe5b25eed platform/x86: lenovo-yogabook: Rename lenovo-yogabook-wmi to lenovo-yogabook) 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 (7029e1b5a94b dt-bindings: leds: Drop redundant cpus enum match) Merging ipmi/for-next (d08076678ce7 ipmi:ssif: Drop if blocks with always false condition) Merging driver-core/driver-core-next (ac9a78681b92 Linux 6.4-rc1) 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 (ac9a78681b92 Linux 6.4-rc1) 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 (afa351a15d80 Merge tag 'drm-intel-next-fixes-2023-04-13' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) Merging coresight/next (18996a113f25 coresight: etm_pmu: Set the module field) Merging fpga/for-next (da4da5b2d708 fpga: dfl-fme: constify pointers to hwmon_channel_info) Merging icc/icc-next (b7590f3841f4 dt-bindings: interconnect: qcom,msm8998-bwmon: Resolve MSM8998 support) Merging iio/togreg (a508fbfed333 iio: kx022a: Probe asynchronously) Merging phy-next/next (7a503071e06d phy: sparx5-serdes: add skip_cmu_cfg check when configuring lanes) 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 (ac9a78681b92 Linux 6.4-rc1) Merging cgroup/for-next (2ef269ef1ac0 cgroup/cpuset: Free DL BW in case can_attach() fails) Merging scsi/for-next (1a7edd041f2d scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend) Merging scsi-mkp/for-next (44ef1604ae94 Merge patch series "smartpqi updates") Merging vhost/linux-next (ebddc00f450d vhost_net: revert upend_idx only on retriable error) Merging rpmsg/for-next (47f64e7ef95a remoteproc: imx_dsp_rproc: use modern pm_ops) Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1) Merging gpio-brgl/gpio/for-next (6c19974d1e83 dt-bindings: gpio: Convert STMPE GPIO to YAML schema) Merging gpio-intel/for-next (782eea0c89f7 gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xNU) Merging pinctrl/for-next (cbbe07781514 pinctrl: qcom: spmi-gpio: Add PM8953 support) Merging pinctrl-intel/for-next (ac9a78681b92 Linux 6.4-rc1) 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 (f8424c54d041 selftests/clone3: test clone3 with exit signal in flags) 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 (ac9a78681b92 Linux 6.4-rc1) 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 (0153431c85af efi: make kobj_type structure constant) 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 (0199849acd07 sysctl: remove register_sysctl_paths()) Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2) 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 (78f7a3fd6dc6 randstruct: disable Clang 15 support) Merging kspp-gustavo/for-next/kspp (00168b415a60 uapi: net: ipv6: Replace fake flex-array with flex-array member) Merging fastrpc/for-next (3f6b4c6f0bd0 fastrpc: Don't assert held reservation lock for dma-buf mmapping) Merging iommufd/for-next (ac9a78681b92 Linux 6.4-rc1)
Attachment:
pgpaSmUf6BNgD.pgp
Description: OpenPGP digital signature
