Hi all, Changes since 20220915: The risc-v-fixes tree gained a conflict against Linus' tree. The mm tree lost its build failure. Non-merge commits (relative to Linus' tree): 6870 8200 files changed, 403927 insertions(+), 180331 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 are also quilt-import.log and merge.log files 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, 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 359 trees (counting Linus' and 98 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 (3245cb65fd91 Merge tag 'devicetree-fixes-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux) Merging fixes/fixes (1c23f9e627a7 Linux 6.0-rc2) Merging mm-hotfixes/mm-hotfixes-unstable (95bdaeee9e82 mm/page_isolation: fix isolate_single_pageblock() isolation behavior) Merging kbuild-current/fixes (80e78fcce86d Linux 6.0-rc5) Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name) Merging arm-current/fixes (25af7406df59 ARM: 9229/1: amba: Fix use-after-free in amba_read_periphid()) Merging arm64-fixes/for-next/fixes (3fe3fd5f3072 arm64: mm: fix resume for 52-bit enabled builds) Merging arm-soc-fixes/arm/fixes (aaa58141a5d7 Merge tag 'at91-fixes-6.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes) Merging drivers-memory-fixes/fixes (c941e6305958 dt-bindings: memory-controllers: fsl,imx8m-ddrc: drop Leonard Crestez) Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) Merging m68k-current/for-linus (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1) Merging powerpc-fixes/fixes (a66de5283e16 powerpc/pseries: Fix plpks crash on non-pseries) Merging s390-fixes/fixes (8d96bba75a43 s390/smp: enforce lowcore protection on CPU restart) Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX) Merging net/master (0727a9a5fbc1 Documentation: mptcp: fix pm_type formatting) Merging bpf/master (a37a32583e28 bpf: btf: fix truncated last_member_type_id in btf_struct_resolve) Merging ipsec/master (26dbd66eab80 esp: choose the correct inner protocol for GSO on inter address family tunnels) 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/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging wireless/for-next (781b80f452fc wifi: mt76: fix 5 GHz connection regression on mt76x0/mt76x2) Merging rdma-fixes/for-rc (a261786fdc0a RDMA/irdma: Report RNR NAK generation in device caps) Merging sound-current/for-linus (ba1f818053b0 ALSA: hda/realtek: Add quirk for ASUS GA503R laptop) Merging sound-asoc-fixes/for-linus (d56ba9a04d75 ASoC: imx-card: Fix refcount issue with of_node_put) Merging regmap-fixes/for-linus (80e78fcce86d Linux 6.0-rc5) Merging regulator-fixes/for-linus (80e78fcce86d Linux 6.0-rc5) Merging spi-fixes/for-linus (80e78fcce86d Linux 6.0-rc5) Merging pci-current/for-linus (0e1fa5155a36 MAINTAINERS: Add Mahesh J Salgaonkar as EEH maintainer) Merging driver-core.current/driver-core-linus (d8ab4685adc1 Revert "driver core: Set fw_devlink.strict=1 by default") Merging tty.current/tty-linus (1d10cd4da593 serial: tegra-tcu: Use uart_xmit_advance(), fixes icount.tx accounting) Merging usb.current/usb-linus (ce001778dfc3 Merge tag 'thunderbolt-for-v6.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (d640c4cb8f2f USB: serial: option: add Quectel RM520N) Merging phy/fixes (0a6fc70d76bd phy: marvell: phy-mvebu-a3700-comphy: Remove broken reset support) Merging staging.current/staging-linus (7e18e42e4b28 Linux 6.0-rc4) Merging iio-fixes/fixes-togreg (f57f4fb09850 iio: light: tsl2583: Fix module unloading) Merging counter-current/counter-current (8294b04153c3 counter: Realign counter_comp comment block to 80 characters) Merging char-misc.current/char-misc-linus (ab0b4b575b46 Merge tag 'phy-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy into char-misc-linus) Merging soundwire-fixes/fixes (4ef3f2aff126 soundwire: qcom: fix device status array range) Merging thunderbolt-fixes/fixes (14c7d9052837 thunderbolt: Add support for Intel Maple Ridge single port controller) Merging input-current/for-linus (9c9c71168f79 Input: iforce - add support for Boeder Force Feedback Wheel) Merging crypto-current/master (874b301985ef crypto: lib - remove unneeded selection of XOR_BLOCKS) Merging vfio-fixes/for-linus (873aefb376bb vfio/type1: Unpin zero pages) Merging kselftest-fixes/fixes (bdbf0617bbc3 selftests/vm: fix inability to build any vm tests) Merging modules-fixes/modules-linus (e69a66147d49 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT) Merging dmaengine-fixes/fixes (e0f1b21c504f dmaengine: zynqmp_dma: Typecast with enum to fix the coverity warning) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (0fddf9ad06fd mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (150f7b11cb59 media: uvcvideo: Fix InterfaceProtocol for Quanta camera) Merging reset-fixes/reset/fixes (51fd191422d9 reset: microchip-sparx5: issue a reset on startup) Merging mips-fixes/mips-fixes (80e78fcce86d Linux 6.0-rc5) Merging at91-fixes/at91-fixes (f5fc22cbbdcd ARM: dts: lan966x: Fix the interrupt number for internal PHYs) Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) Merging kvm-fixes/master (29250ba51bc1 Merge tag 'kvm-s390-master-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvms390-fixes/master (ca922fecda6c KVM: s390: pci: Hook to access KVM lowlevel from VFIO) Merging hwmon-fixes/hwmon (80e78fcce86d Linux 6.0-rc5) Merging nvdimm-fixes/libnvdimm-fixes (17d9c15c9b9e fsdax: Fix infinite loop in dax_iomap_rw()) Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation) Merging btrfs-fixes/next-fixes (351ff18f7481 Merge branch 'misc-6.0' into next-fixes) Merging vfs-fixes/fixes (bfbfb6182ad1 nfsd_splice_actor(): handle compound pages) Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (647e82dbf851 platform/x86: p2sb: Fix UAF when caller uses resource name) Merging samsung-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1) Merging pinctrl-samsung-fixes/fixes (568035b01cfb Linux 6.0-rc1) Merging devicetree-fixes/dt/linus (de11663b75b0 dt-bindings: pinctrl: qcom: drop non-working codeaurora.org emails) Merging dt-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1) Merging scsi-fixes/fixes (991df3dd5144 scsi: mpt3sas: Fix use-after-free warning) Merging drm-fixes/drm-fixes (80e78fcce86d Linux 6.0-rc5) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (8787f6fab413 Revert "drm/i915/display: Re-add check for low voltage sku for max dp source rate") Merging mmc-fixes/fixes (35ca91d1338a mmc: moxart: fix 4-bit bus width and remove 8-bit bus width) Merging rtc-fixes/rtc-fixes (568035b01cfb Linux 6.0-rc1) Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3) Merging hyperv-fixes/hyperv-fixes (f0880e2cb7e1 Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region) Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (af193cc7fc35 riscv: fix a nasty sigreturn bug...) CONFLICT (content): Merge conflict in arch/riscv/mm/pageattr.c Merging risc-v-mc-fixes/dt-fixes (0dec364ffeb6 riscv: dts: microchip: use an mpfs specific l2 compatible) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (568035b01cfb Linux 6.0-rc1) Merging spdx/spdx-linus (568035b01cfb Linux 6.0-rc1) Merging gpio-brgl-fixes/gpio/for-current (09eed5a1ed3c gpio: mt7621: Make the irqchip immutable) Merging gpio-intel-fixes/fixes (568035b01cfb Linux 6.0-rc1) Merging pinctrl-intel-fixes/fixes (568035b01cfb Linux 6.0-rc1) Merging erofs-fixes/fixes (80e78fcce86d Linux 6.0-rc5) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (2a2dfc869d33 tools: Add new "test" taint to kernel-chktaint) Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb()) Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) Merging cel-fixes/for-rc (00801cd92d91 NFSD: fix regression with setting ACLs.) Merging irqchip-fixes/irq/irqchip-fixes (8d5356f9820d irqchip: Select downstream irqchip drivers for LoongArch CPU) Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) Merging broadcom-fixes/fixes (b6fa04765857 Merge branch 'drivers/fixes' into fixes) Merging perf-current/perf/urgent (9b4509495418 Merge tag 'for-6.0-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging efi-fixes/urgent (9cb636b5f6a8 efi: capsule-loader: Fix use-after-free in efi_capsule_write) Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) Merging battery-fixes/fixes (9db5f08ca99d power: supply: ab8500: remove unused static local variable) Merging drm-misc-fixes/for-linux-next-fixes (b0b9408f1326 drm/rockchip: Fix return type of cdn_dp_connector_mode_valid) Merging kbuild/for-next (5f5ef75d1c4b scripts: remove unused argument 'type') Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (62e64c9d2fd1 perf test: Add basic core_wide expression test) Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) Merging dma-mapping/for-next (9fc18f6d56d5 dma-mapping: mark dma_supported static) Merging asm-generic/master (fdc5bebfb66b parisc: hide ioread64 declaration on 32-bit) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (5d6dd664478f Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (daecb3077f33 Merge branches 'for-next/misc', 'for-next/kselftest', 'for-next/doc', 'for-next/sve', 'for-next/sysreg', 'for-next/gettimeofday', 'for-next/stacktrace' and 'for-next/atomics' into for-next/core) Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) Merging arm-soc/for-next (5ff4137055a2 Merge branch 'arm/soc' into for-next) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (727d51a3ed30 Merge branch 'v6.1/dt64' into for-next) Merging aspeed/for-next (7bc156fbb726 ARM: config: aspeed_g5: Enable PECI) Merging at91/at91-next (3d395fc5ca0a Merge branch 'clk-microchip' into at91-next) Merging broadcom/next (122de0c73256 Merge branch 'maintainers/next' into next) Merging drivers-memory/for-next (f492ddd4aaad Merge branch 'for-v6.1/mediatek' into for-next) Merging imx-mxs/for-next (e2e1869ddb2a Merge branch 'imx/dt64' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (05980182ed25 Merge branch 'v6.0-next/soc' into for-next) Merging mvebu/for-next (74de3ae81a42 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (8efe5dea6753 Merge branch 'omap-for-v6.1/dt' into for-next) Merging qcom/for-next (49a649b9cbf3 Merge branches 'arm64-defconfig-for-6.1', 'arm64-for-6.1', 'clk-for-6.1', 'defconfig-for-6.1', 'drivers-for-6.1', 'dts-for-6.1' and 'arm64-fixes-for-6.0' into for-next) Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) Merging renesas/next (3319a5eda420 Merge branch 'renesas-arm-dt-for-v6.1' into renesas-next) Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") Merging rockchip/for-next (875e259a8a86 Merge branch 'v6.1-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (37ff5e2f7bd2 Merge branch 'next/drivers' into for-next) Merging scmi/for-linux-next (1f3a176f26cc Merge tag 'ffa-updates-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (400a100c28fe ARM: dts: stm32: argon: remove spidev node) Merging sunxi/sunxi/for-next (ebb11236fe25 Merge branch 'sunxi/drivers-fixes-for-6.0' into sunxi/for-next) Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) Merging tegra/for-next (761c03270244 Merge branch for-6.1/arm64/defconfig into for-next) Merging ti/ti-next (acf3fdc88665 arm64: dts: ti: k3-am625-sk: Add epwm nodes) Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node) Merging clk/clk-next (de86412dc79f Merge branch 'clk-fixes' into clk-next) Merging clk-imx/for-next (9dfb5937c56b clk: imx93: add SAI IPG clk) Merging clk-renesas/renesas-clk (e312ae92077f dt-bindings: clock: renesas,rzg2l: Document RZ/Five SoC) Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) Merging csky/linux-next (45fef4c4b9c9 csky: abiv1: Fixup compile error) Merging loongarch/loongarch-next (b90cb1053190 Linux 6.0-rc3) Merging m68k/for-next (feb159347bb0 m68k: Allow kexec on M68KCLASSIC with MMU enabled only) Merging m68knommu/for-next (9ad3a9ca3510 m68knommu: fix non-mmu classic 68000 legacy timer tick selection) Merging microblaze/next (568035b01cfb Linux 6.0-rc1) Merging mips/mips-next (0153682e9e6a MIPS: dts: lantiq: rename dts files with soc name being the prefix) Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (52e0ea900202 openrisc: io: Define iounmap argument as volatile) Merging parisc-hd/for-next (805ce8614958 parisc: Allow CONFIG_64BIT with ARCH=parisc) Merging powerpc/next (78c73c80fd86 powerpc/math-emu: Inhibit W=1 warnings) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (096b52fd2bb4 perf: RISC-V: throttle perf events) Merging risc-v-mc/dt-for-next (7eac0081a8e9 riscv: dts: microchip: add qspi compatible fallback) Merging s390/for-next (5b5504d5fccd Merge branch 'features' into for-next) Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) Merging uml/linux-next (af3e16101cee um: include sys/types.h for size_t) Merging xtensa/xtensa-for-next (e3ddb8bbe0f8 xtensa: add FDPIC and static PIE support for noMMU) Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next) Merging vfs-idmapping/for-next (6344e66970c6 xattr: constify value argument in vfs_setxattr()) Merging fscrypt/master (18136e49cb00 fscrypt: work on block_devices instead of request_queues) 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 (26291c54e111 Linux 5.17-rc2) Merging btrfs/for-next (caeaee0f40e2 Merge branch 'for-next-next-v6.0-20220913' into for-next-20220913) Merging ceph/master (0edddc4160b9 ceph: remove Sage's git tree from documentation) Merging cifs/for-next (8af8aed97beb cifs: update internal module number) Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem()) Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) Merging erofs/dev (80e78fcce86d Linux 6.0-rc5) Merging exfat/dev (2e9ceb6728f1 exfat: fix overflow for large capacity partition) Merging ext3/for_next (11fdae37d482 Pull udf splice fix.) Merging ext4/dev (d95efb14c0b8 ext4: add ioctls to get/set the ext4 superblock uuid) Merging f2fs/dev (108d4d310318 f2fs: fix to do sanity check on summary info) Merging fsverity/fsverity (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap()) Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount) Merging gfs2/for-next (204c0300c4e9 gfs2: Switch from strlcpy to strscpy) Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) Merging ksmbd/ksmbd-for-next (8c9073fa857c ksmbd: constify struct path) Merging nfs/linux-next (3245cb65fd91 Merge tag 'devicetree-fixes-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux) Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking()) Merging nfsd/for-next (395289f8a048 NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data) CONFLICT (content): Merge conflict in fs/nfsd/vfs.c Merging ntfs3/master (3b06a2755758 Merge tag 'ntfs3_for_6.0' of https://github.com/Paragon-Software-Group/linux-ntfs3) Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()) Merging overlayfs/overlayfs-next (4f1196288dfb ovl: fix spelling mistakes) Merging ubifs/next (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed) Merging v9fs/9p-next (02ed50db058d net/9p: allocate appropriate reduced message buffers) Merging xfs/for-next (031d166f968e xfs: fix inode reservation space for removing transaction) Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) Merging iomap/iomap-for-next (478af190cb6c iomap: remove iomap_writepage) Merging statx-dioalign/statx-dioalign (61a223df421f xfs: support STATX_DIOALIGN) Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) Merging file-locks/locks-next (072e51356cd5 Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) Merging vfs/for-next (0a97e98ab197 Merge branches 'work.path' and 'work.file_inode' into for-next) Merging printk/for-next (c0a684057235 Merge branch 'for-6.1/trivial' into for-next) Merging pci/next (c327b44793ae Merge branch 'remotes/lorenzo/pci/qcom') Merging pstore/for-next/pstore (27001e611bb6 pstore/zone: Use GFP_ATOMIC to allocate zone buffer) Merging hid/for-next (d9c1c1a0a501 Merge branch 'for-6.1/logitech' into for-next) Merging i2c/i2c/for-next (12452662e011 Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (568035b01cfb Linux 6.0-rc1) Merging dmi/dmi-for-next (d2139dfca361 firmware: dmi: Use the proper accessor for the version field) Merging hwmon-staging/hwmon-next (e8a253862802 hwmon: (mr75203) skip reset-control deassert for SOCs that don't support it) Applying: hwmon: (emc2305) fix up for "i2c: Make remove callback return void" Merging jc_docs/docs-next (7ebeef22dcc2 Merge branch 'docs-mw' into docs-next) Merging v4l-dvb/master (fbb6c848dd89 media: destage Hantro VPU driver) Merging v4l-dvb-next/master (f7ec3f62d773 media: remove reference to CONFIG_EMBEDDED in MEDIA_SUPPORT_FILTER) Merging pm/linux-next (2bc2aea001d3 Merge branch 'acpi-bus' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (ddf958f39741 cpufreq: tegra194: Remove the unneeded result variable) Merging cpupower/cpupower (568035b01cfb Linux 6.0-rc1) Merging devfreq/devfreq-next (68831c5f94cb PM / devfreq: mtk-cci: Handle sram regulator probe deferral) Merging opp/opp/linux-next (c7e31e36d8a2 dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes) Merging thermal/thermal/linux-next (64b269c00227 thermal/core: Add a check before calling set_trip_temp()) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (56171e0db23a fs: dlm: const void resource name parameter) Merging rdma/for-next (db77d84cfe36 RDMA/rtrs-clt: Kill xchg_paths) Merging net-next/master (8a26a9dee5e3 Merge branch 'net-ftgmac100-support-fixed-link') Merging bpf-next/for-next (47e34cb74d37 bpf: Add verifier check for BPF_PTR_POISON retval and arg) Merging ipsec-next/master (50c448bbc198 Merge remote-tracking branch 'xfrm: start adding netlink extack support') CONFLICT (content): Merge conflict in include/net/dst_metadata.h Merging mlx5-next/mlx5-next (4ced81c02b03 net/mlx5: Add IFC bits and enums for crypto key) CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/fw.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/main.c CONFLICT (content): Merge conflict in include/linux/mlx5/device.h CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bluetooth/master (812e92b824c1 Bluetooth: RFCOMM: Fix possible deadlock on socket shutdown/release) Merging wireless-next/for-next (d5350756c03c wifi: rtl8xxxu: Remove copy-paste leftover in gen2_update_rate_mask) Merging mtd/mtd/next (7ec4cdb32173 mtd: core: check partition before dereference) Merging nand/nand/next (e16eceea863b mtd: rawnand: arasan: Fix clock rate in NV-DDR) Merging spi-nor/spi-nor/next (f8cd9f632f44 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}()) Merging crypto/master (96d3e6f05f5b crypto: nx - Remove the unneeded result variable) Merging drm/drm-next (d1e2d6b78ffc Merge tag 'drm-intel-next-2022-08-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v11_0.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/i915/display/icl_dsi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c Merging drm-misc/for-linux-next (98a65e6d498c drm/rockchip: remove vop_writel from vop1 driver) Merging amdgpu/drm-next (dacd2d2d9d80 drm/amd/display: fix boolconv.cocci warning) Merging drm-intel/for-linux-next (21f0b7dabf9c drm/i915: Fix return type of mode_valid function hook) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Applying: drm/i915: fix up for "drm/i915: Rename ggtt_view as gtt_view" Merging drm-tegra/for-next (4d74f5f6b0be drm/tegra: Convert to using is_hdmi from display info) Merging drm-msm/msm-next (d6463fd4e975 drm/msm/a6xx: Handle GMU prepare-slumber hfi failure) Merging drm-msm-lumag/msm-next-lumag (6678f4743572 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi' and 'msm-next-lumag-hdmi' into msm-next-lumag) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem.h Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (332f847212e4 drm/etnaviv: reap idle mapping if it doesn't match the softpin address) Merging fbdev/for-next (1c23f9e627a7 Linux 6.0-rc2) Merging regmap/for-next (694cf81e9000 Merge remote-tracking branch 'regmap/for-6.1' into regmap-next) Merging sound/for-next (39efc9c8a973 ALSA: usb-audio: Fix last interface check for registration) Merging sound-asoc/for-next (5287d5b77fc2 Merge remote-tracking branch 'asoc/for-6.1' into asoc-next) Merging modules/modules-next (77d6354bd422 module/decompress: generate sysfs string at compile time) Merging input/next (7984b4354207 Input: synaptics - enable InterTouch for the ThinkPad P1 G3) Merging block/for-next (52f3156bd209 Merge branch 'for-6.1/block' into for-next) Merging device-mapper/for-next (c8e2f5c3682d dm verity: enable WQ_HIGHPRI on verify_wq) Merging libata/for-next (e9892dce44f2 ata: pata_macio: Remove unneeded word in comments) Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) Merging mmc/next (627a78b2dec6 mmc: Merge branch fixes into next) Merging mfd/for-mfd-next (e00e66be677a dt-bindings: mfd: sprd: Add bindings for ums512 global registers) CONFLICT (modify/delete): drivers/mfd/intel_soc_pmic_core.c deleted in mfd/for-mfd-next and modified in HEAD. Version HEAD of drivers/mfd/intel_soc_pmic_core.c left in tree. $ git rm -f drivers/mfd/intel_soc_pmic_core.c Applying: mfd: fix up for "i2c: Make remove callback return void" Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support) Merging battery/for-next (55cafd4ba42c power: supply: bq25890: Fix enum conversion in bq25890_power_supply_set_property()) CONFLICT (content): Merge conflict in drivers/power/supply/cw2015_battery.c Merging regulator/for-next (663ec13e89b4 Merge remote-tracking branch 'regulator/for-6.1' into regulator-next) Merging security/next (1e7d8bcbe37d lockdown: ratelimit denial messages) CONFLICT (content): Merge conflict in security/selinux/include/classmap.h Merging apparmor/apparmor-next (79eb2711c919 apparmor: correct config reference to intended one) Merging integrity/next-integrity (5926586f291b ima: fix blocking of security.ima xattrs of unsupported algorithms) Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) Merging selinux/next (09b71adab095 selinux: remove the unneeded result variable) Merging smack/next (f393b3fd2a4b smack: cleanup obsolete mount option flags) Merging tomoyo/master (841b171b4534 locking/lockdep: add debug_show_all_lock_holders()) Merging tpmdd/next (863ed94c589f tpm: Add check for Failure mode for TPM2 modules) Merging watchdog/master (b90cb1053190 Linux 6.0-rc3) Merging iommu/next (d154e4a92f79 Merge branches 'iommu/fixes', 'arm/omap', 'virtio', 'x86/amd' and 'core' into next) Merging audit/next (934f70d9d498 audit: remove selinux_audit_rule_update() declaration) Merging devicetree/for-next (a607a850ba1f dt-bindings: nvmem: u-boot,env: add basic NVMEM cells) Merging dt-krzk/for-next (a70369e1b7f6 ARM: dts: sunplus: sp7021: drop incorrect spi-max-frequency) Merging mailbox/mailbox-for-next (8a8dc2b9596e mailbox: imx: clear pending interrupts) Merging spi/for-next (7f9c088f08cb Merge remote-tracking branch 'spi/for-6.1' into spi-next) Merging tip/master (82eedfedea44 Merge branch into tip/master: 'x86/timers') Merging clockevents/timers/drivers/next (c19e18637d89 clocksource/drivers/sun4i: Remove unnecessary (void*) conversions) Merging edac/edac-for-next (cd687f34d565 Merge branch 'edac-misc' into edac-for-next) Merging irqchip/irq/irqchip-next (2bd1753e8c43 Merge branch irq/misc-5.20 into irq/irqchip-next) Merging ftrace/for-next (07a451dae367 Merge branch 'trace/for-next-core' into trace/for-next) Merging rcu/rcu/next (7139c19d2ea1 rcu: Synchronize ->qsmaskinitnext in rcu_boost_kthread_setaffinity()) Merging kvm/next (372d07084593 KVM: selftests: Fix ambiguous mov in KVM_ASM_SAFE()) Merging kvm-arm/next (0982c8d859f8 Merge branch kvm-arm64/nvhe-stacktrace into kvmarm-master/next) Merging kvms390/next (f5ecfee94493 KVM: s390: resetting the Topology-Change-Report) Merging xen-tip/linux-next (e9ea0b30ada0 xen/grants: prevent integer overflow in gnttab_dma_alloc_pages()) Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync()) Merging drivers-x86/for-next (76fba1221e30 Merge tag 'backlight-detect-refactor-1' into review-hans) Merging chrome-platform/for-next (348a2e8c93d3 platform/chrome: cros_ec_typec: Register partner PDOs) Merging hsi/for-next (551e325bbd3f HSI: omap_ssi_port: Fix dma_map_sg error check) Merging leds/for-next (568035b01cfb Linux 6.0-rc1) Merging ipmi/for-next (ba5829c6543f ipmi:ipmb: Fix a vague comment and a typo) Merging driver-core/driver-core-next (a791dc135325 Merge 6.0-rc5 into driver-core-next) Merging usb/usb-next (7eb2bf871454 usb: misc: usb3503: call clk_disable_unprepare in the error handling) Merging thunderbolt/next (387a42cfcf92 thunderbolt: Fix spelling mistake "simultaneusly" -> "simultaneously") Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (cfebcd53e65e USB: serial: ftdi_sio: add support for HP and HA devices) Merging tty/tty-next (ccf3a570410a termios: kill uapi termios.h that are identical to generic one) Merging char-misc/char-misc-next (ceecbbddbf54 comedi: convert sysfs snprintf to sysfs_emit) Merging coresight/next (5fc1531dd771 hwtracing: hisi_ptt: Fix up for "iommu/dma: Make header private") Merging fpga/for-next (562d0bf2cab8 fpga: m10bmc-sec: d5005 bmc secure update driver) Merging icc/icc-next (aff72c797ff0 Merge branch 'icc-ignore-return-val' into icc-next) Merging iio/togreg (2f61ff827296 iio: pressure: icp10100: Switch from UNIVERSAL to DEFINE_RUNTIME_DEV_PM_OPS().) Merging phy-next/next (af96579dc317 phy: ti: gmii-sel: Add support for CPSW5G GMII SEL in J7200) Merging soundwire/next (279e46bc2986 soundwire: intel: cleanup WakeEnable and WakeStatus) Merging extcon/extcon-next (822a6200734c extcon: usbc-tusb320: Add USB TYPE-C support) Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) Merging vfio/next (f39856aacb07 vfio/mlx5: Set the driver DMA logging callbacks) Merging staging/staging-next (9634b371b66a staging: wlan-ng: remove unused p80211wext_handler_def declaration) Merging counter-next/counter-next (a12224997bec counter: Move symbols into COUNTER namespace) Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging dmaengine/next (84dd3b2b95ef dmaengine: dw-axi-dmac: Drop obsolete dependency on COMPILE_TEST) Merging cgroup/for-next (a2675ab75dff Merge branch 'for-6.1' into for-next) CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c Applying: sched/psi: fix up for "cgroup: Remove CFTYPE_PRESSURE" Merging scsi/for-next (002e36fc62e9 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (7f615c1b5986 scsi: scsi_transport_fc: Use %u for dev_loss_tmo) Merging vhost/linux-next (8f113a4ad40d virtio: drop vp_legacy_set_queue_size) Merging rpmsg/for-next (5a3a3b45c357 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging gpio-brgl/gpio/for-next (d9e7f0e32051 gpiolib: of: factor out conversion from OF flags) Merging gpio-intel/for-next (0ea76c401f92 gpiolib: acpi: Add a quirk for Asus UM325UAZ) Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) Merging pinctrl/for-next (04fa696fc49c Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (568035b01cfb Linux 6.0-rc1) Merging pinctrl-renesas/renesas-pinctrl (96355be8f0a2 dt-bindings: pinctrl: renesas: Document RZ/Five SoC) Merging pinctrl-samsung/for-next (9d9292576810 dt-bindings: pinctrl: samsung: deprecate header with register constants) Merging pwm/for-next (8933d30c5f46 pwm: lpc18xx: Fix period handling) Merging userns/for-next (a0b88362d2c7 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, and retire_mq_sysctls-for-v5.19 for testing in linux-next) Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (2626cd3b3126 docs:kselftest: fix kselftest_module.h path of example module) CONFLICT (content): Merge conflict in drivers/cpufreq/amd-pstate.c Merging livepatching/for-next (3ea7cd6069be Merge branch 'for-6.1/fixes' into for-next) Merging rtc/rtc-next (509451ac03eb rtc: gamecube: Always reset HW_SRNPROT after read) Merging nvdimm/libnvdimm-for-next (53fc59511fc4 nvdimm/namespace: drop unneeded temporary variable in size_store()) Merging at24/at24/for-next (568035b01cfb Linux 6.0-rc1) Merging ntb/ntb-next (568035b01cfb Linux 6.0-rc1) Merging seccomp/for-next/seccomp (4e92863862d1 Merge branch 'for-linus/seccomp' into for-next/seccomp) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging fsi/next (04823dd2af87 fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe) Merging slimbus/for-next (3f9400e61107 slimbus: qcom-ngd: simplify error paths with dev_err_probe) Merging nvmem/for-next (2ea556524fbf dt-bindings: nvmem: Add SoC compatible for sm6115) Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) Merging hyperv/hyperv-next (d180e0a1be6c Drivers: hv: Create debugfs file with hyper-v balloon usage information) Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy()) Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) Merging hmm/hmm (568035b01cfb Linux 6.0-rc1) Merging kunit/test (568035b01cfb Linux 6.0-rc1) Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) Merging kunit-next/kunit (568035b01cfb Linux 6.0-rc1) Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) Merging mhi/mhi-next (5db00d7d0d4d bus: mhi: host: always print detected modem name) Merging memblock/for-next (42c3ba865818 memblock_tests: move variable declarations to single block) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging cxl/next (1cd8a2537eb0 cxl/hdm: Fix skip allocations vs multiple pmem allocations) Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.) Merging efi/next (4bf232988200 Merge tag 'efi-loongarch-for-v6.1' into efi/next) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (0e5d069dcc0c Merge branch 'slab/for-6.1/slub_validation_locking' into slab/for-next) Merging random/master (b931eaf6ef5c random: restore O_NONBLOCK support) Merging landlock/next (4908e7a3045c Merge branch 'landlock-next-truncate' into landlock-next) Merging rust/rust-next (07a3263c2554 init/Kconfig: Specify the interpreter for rust_is_available.sh) CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in Makefile Applying: rust: fix up for "kbuild: move core-y and drivers-y to ./Kbuild" Merging sysctl/sysctl-next (c06a17fe056b kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred}) Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages) Merging execve/for-next/execve (33a2d6bc3480 Revert "fs/exec: allow to unshare a time namespace on vfork+exec") Merging bitmap/bitmap-for-next (b9be19eef355 drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES) Merging hte/for-next (568035b01cfb Linux 6.0-rc1) Merging kspp/for-next/kspp (06c1c49d0cd1 fortify: Adjust KUnit test for modular build) CONFLICT (content): Merge conflict in lib/Kconfig.debug Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) Merging mm-stable/mm-stable (088b8aa537c2 mm: fix PageAnonExclusive clearing racing with concurrent RCU GUP-fast) Merging mm-nonmm-stable/mm-nonmm-stable (b81475117547 latencytop: use the last element of latency_record of system) Merging mm/mm-everything (fbb5623fcdd8 Merge branch 'mm-nonmm-unstable' into mm-everything) CONFLICT (content): Merge conflict in block/blk-map.c CONFLICT (content): Merge conflict in crypto/Kconfig CONFLICT (content): Merge conflict in fs/exec.c CONFLICT (content): Merge conflict in mm/slub.c CONFLICT (content): Merge conflict in mm/vmscan.c CONFLICT (content): Merge conflict in tools/testing/selftests/vm/hmm-tests.c Applying: mm/slab: fix up for "mm: kmsan: call KMSAN hooks from SLUB code" Applying: crypto: Kconfig: fix up for "crypto: kmsan: disable accelerated configs under KMSAN" Applying: Revert "drm/msm/gem: Evict active GEM objects when necessary"
Attachment:
pgpByv5h1yRPN.pgp
Description: OpenPGP digital signature
