Hi all, News: I will not be doing linux-next releases next week (maybe one or two). Changes since 20220921: New trees: asahi-soc-fixes and asahi-soc The net-next tree gained a conflict against the bpf tree. The nand tree lost its build failure. The rcu tree gained a conflict against the jc_docs tree. The leds tree gained a build failure so I used the version from next-20220921. The ipmi tree gained a conflict against the i2c tree. The mm tree gained 2 build failures for which I applied a patch and reverted a commit. Non-merge commits (relative to Linus' tree): 8608 9515 files changed, 478787 insertions(+), 201809 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 362 trees (counting Linus' and 100 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 (bf682942cd26 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging fixes/fixes (1c23f9e627a7 Linux 6.0-rc2) Merging mm-hotfixes/mm-hotfixes-unstable (cb51a80605c0 MAINTAINERS: drop entry to removed file in ARM/RISCPC ARCHITECTURE) 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 (14ca1a469075 ARM: 9247/1: mm: set readonly for MT_MEMORY_RO with ARM_LPAE) Merging arm64-fixes/for-next/fixes (05d6f6d346fe perf/arm-cmn: Add more bits to child node address offset field) 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 (1918f2b20c3d s390/vfio-ap: bypass unnecessary processing of AP resources) 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 (504c25cb76a9 Merge tag 'net-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (60240bc26114 xsk: Inherit need_wakeup flag for shared sockets) 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 (c35fbea48659 ALSA: hda: intel-dsp-config: add missing RaptorLake PCI IDs) Merging sound-asoc-fixes/for-linus (6de0b0292b54 ASoC: es8316: fix register sync error in suspend/resume tests) 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 (d7f06bdd6ee8 drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES) Merging tty.current/tty-linus (643792048ee8 serial: sifive: enable clocks for UART when probed) Merging usb.current/usb-linus (47af6c640ed8 Merge tag 'usb-serial-6.0-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial 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 (ab4bbde809ff Merge tag 'fpga-for-6.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-linus) Merging soundwire-fixes/fixes (4ef3f2aff126 soundwire: qcom: fix device status array range) Merging thunderbolt-fixes/fixes (31f87f705b3c thunderbolt: Explicitly reset plug events delay back to USB4 spec value) 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 (ab4fff87f9db dmaengine: mxs: use platform_driver_register) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (568035b01cfb Linux 6.0-rc1) 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 (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting) Merging mips-fixes/mips-fixes (e9f3f8f48800 MIPS: Loongson32: Fix PHY-mode being left unspecified) 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 (50b2d49bafa1 KVM: x86: Inject #UD on emulated XSETBV if XSAVES isn't enabled) Merging kvms390-fixes/master (189e7d876e48 KVM: s390: pci: register pci hooks without interpretation) Merging hwmon-fixes/hwmon (7f62cf781e65 hwmon: (gsc-hwmon) Call of_node_get() before of_find_xxx API) 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 (e0e0747de0ea scsi: mpt3sas: Fix return value check of dma_get_required_mask()) Merging drm-fixes/drm-fixes (521a547ced64 Linux 6.0-rc6) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (d119888b09bd drm/i915/gem: Really move i915_gem_context.link under ref protection) Merging mmc-fixes/fixes (e9233917a7e5 mmc: core: Terminate infinite loop in SD-UHS voltage switch) 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 (398a8d83f758 cpuidle: riscv-sbi: Fix CPU_PM_CPU_IDLE_ENTER_xyz() macro usage) 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 (69bef19d6b97 gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully) 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 (e7ccba7728cf irqchip/loongson-pch-lpc: Add dependence on LoongArch) 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 (c69cf88cda5f Merge tag 'soc-fixes-6.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) Merging efi-fixes/urgent (5f56a74cc0a6 efi: libstub: check Shim mode using MokSBStateRT) 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 uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) Merging drm-misc-fixes/for-linux-next-fixes (d8a79c030549 drm/hisilicon: Add depends on MMU) Merging kbuild/for-next (60ecfddd7a09 linux/export: use inline assembler to populate symbol CRCs) 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 (91fd38ea7589 MAINTAINERS: merge SWIOTLB SUBSYSTEM into DMA MAPPING HELPERS) 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 (c22ba718e860 Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (d5e6a1a50e3f Merge branch 'for-next/misc' 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 (d2c3fe578acd 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 asahi-soc/asahi-soc/for-next (e9bd9228e762 arm64: dts: apple: Add ADMAC resets on t8103/t600x) Merging aspeed/for-next (7bc156fbb726 ARM: config: aspeed_g5: Enable PECI) Merging at91/at91-next (a3e83ce7ece6 Merge branch 'at91-dt' into at91-next) Merging broadcom/next (122de0c73256 Merge branch 'maintainers/next' into next) Merging drivers-memory/for-next (a7c112afc86b Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (26f60c42dc9d Merge branch 'imx/dt64' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (cbb1618792e2 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 (aaad58005095 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 (2918d1d088b5 Merge branches 'renesas-arm-dt-for-v6.1' and 'renesas-arm-soc-for-v6.1' into renesas-next) Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") Merging rockchip/for-next (ecd61e0144d0 Merge branch 'v6.1-clock/next' into for-next) Merging samsung-krzk/for-next (3828290b1627 Merge branch 'next/soc' into for-next) Merging scmi/for-linux-next (521a547ced64 Linux 6.0-rc6) Merging stm32/stm32-next (400a100c28fe ARM: dts: stm32: argon: remove spidev node) Merging sunxi/sunxi/for-next (1cd67985e174 Merge branch 'sunxi/drivers-for-6.1' into sunxi/for-next) Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) Merging tegra/for-next (ecbdf04a902e Merge branch for-6.1/arm64/defconfig into for-next) Merging ti/ti-next (0d0a0b441346 arm64: dts: ti: k3-j7200: fix main pinmux range) 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 (67e16ac1fec4 clk: imx93: add SAI IPG clk) Merging clk-renesas/renesas-clk (e46a1a9943c0 clk: renesas: r8a779g0: Add EtherAVB clocks) 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 (15f9042311b0 m68k: defconfig: Update defconfigs for v6.0-rc2) Merging m68knommu/for-next (8fef599486c0 m68knommu: fix non-mmu classic 68000 legacy timer tick selection) Merging microblaze/next (568035b01cfb Linux 6.0-rc1) Merging mips/mips-next (0dedcf6e3301 MIPS: BCM47XX: Cast memcmp() of function to (void *)) 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 (521a547ced64 Linux 6.0-rc6) Merging powerpc/next (3d7a198cfdb4 KVM: PPC: remove orphan declarations from kvm_ppc.h) 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 (b7a9ea042881 riscv: dts: microchip: add a devicetree for aries' m100pfsevp) CONFLICT (content): Merge conflict in arch/riscv/boot/dts/microchip/mpfs.dtsi Merging s390/for-next (034551ce2e8a 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/next (193cb8372424 uml: Remove the initialization of statics to 0) 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 (f79a09c3e0c6 Merge branch 'fs.chown_common.fix' into for-next) Merging fscrypt/master (0e91fc1e0f5c 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 (2b5ee96ccec0 Merge branch 'for-next-next-v6.0-20220921' into for-next-20220921) Merging ceph/master (0edddc4160b9 ceph: remove Sage's git tree from documentation) Merging cifs/for-next (d3a8b6185078 cifs: find and use the dentry for cached non-root directories also) 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 (2ef164414123 erofs: introduce 'domain_id' mount option) Merging exfat/dev (2e9ceb6728f1 exfat: fix overflow for large capacity partition) Merging ext3/for_next (11fdae37d482 Pull udf splice fix.) Merging ext4/dev (1a0bdad3d548 ext4: limit the number of retries after discarding preallocations blocks) 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 (74b1b10e29b1 gfs2: Register fs after creating workqueues) Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) Merging ksmbd/ksmbd-for-next (a0bc3210f376 ksmbd: update documentation) Merging nfs/linux-next (521a547ced64 Linux 6.0-rc6) Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking()) Merging nfsd/for-next (cb4b40169878 NFSD: Rename the fields in copy_stateid_t) 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 (669d204469c4 ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl) Merging v9fs/9p-next (02ed50db058d net/9p: allocate appropriate reduced message buffers) Merging xfs/for-next (dc256418235a xfs: do not need to check return value of xlog_kvmalloc()) 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 (d21e9f446501 Merge branch 'work.misc' into for-next) Merging printk/for-next (1c7b98e2490e Merge branch 'for-6.1' into for-next) Merging pci/next (fcf773ae8016 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 (dc096887909e Merge branch 'for-6.1/nintendo' into for-next) Merging i2c/i2c/for-next (c36b475b8bc4 Merge branch 'i2c/for-current' 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 (79005c987a8d hwmon: (mr75203) fix undefined reference to `__divdi3') Applying: hwmon: (emc2305) fix up for "i2c: Make remove callback return void" Merging jc_docs/docs-next (a8249d62a611 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 (62022c15f627 Merge branch 'pm-opp' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (676886010707 cpufreq: tegra194: Add support for Tegra239) 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 (2b109cffe683 thermal/drivers/intel: Use generic thermal_zone_get_trip() function) 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 (9bdb9350f380 RDMA/erdma: Support dynamic mtu) Merging net-next/master (0140a7168f8b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) CONFLICT (content): Merge conflict in kernel/bpf/helpers.c Merging bpf-next/for-next (ee9bb9b4459a Merge branch 'Fix resource leaks in test_maps') 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 (ed680f925aea Bluetooth: hci_event: Make sure ISO events don't affect non-ISO connections) Merging wireless-next/for-next (aa7a5f946f5b Merge tag 'iwlwifi-next-for-kalle-2022-09-18' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) Merging mtd/mtd/next (095bb6e44eb1 mtdchar: add MEMREAD ioctl) Merging nand/nand/next (ba47a6ac4658 mtd: rawnand: meson: stop supporting legacy clocks) 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 (072d36eefd6f crypto: qat - use reference to structure in dma_map_single()) Merging drm/drm-next (320305923c88 Merge tag 'du-next-20220907' of git://linuxtv.org/pinchartl/media into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 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/dc.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.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/intel_backlight.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bios.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c Merging drm-misc/for-linux-next (39dd0cc2e5bd drm/amdgpu: Fix VRAM eviction issue) CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/power.c Merging amdgpu/drm-next (7acdf636a159 drivers/amd/pm: check the return value of amdgpu_bo_kmap) Merging drm-intel/for-linux-next (9045c0529c40 drm/i915/fbc: Use lockdep_assert_held()) Merging drm-tegra/for-next (4d74f5f6b0be drm/tegra: Convert to using is_hdmi from display info) Merging drm-msm/msm-next (e8b595f7b058 drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dsi/dsi_cfg.c Merging drm-msm-lumag/msm-next-lumag (e8b595f7b058 drm/msm/hdmi: make hdmi_phy_8996 OF clk provider) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (61a6920bb604 drm/etnaviv: fix power register offset on GC300) Merging fbdev/for-next (1c23f9e627a7 Linux 6.0-rc2) Merging regmap/for-next (83eb8f73e86b Merge remote-tracking branch 'regmap/for-6.1' into regmap-next) Merging sound/for-next (ef6f5494faf6 ALSA: hda/hdmi: Use only dynamic PCM device allocation) Merging sound-asoc/for-next (0eb23a9f50ab Merge remote-tracking branch 'asoc/for-6.1' into asoc-next) CONFLICT (content): Merge conflict in sound/soc/codecs/cs42l42.c Applying: ASoC: cs42l42: fix up for "i2c: Make remove callback return void" Applying: ASoC: cs42l83: fix up for "i2c: Make remove callback return void" Merging modules/modules-next (77d6354bd422 module/decompress: generate sysfs string at compile time) Merging input/next (437d49b051e8 dt-bindings: input: auo-pixcir-ts: fix gpio and interrupt properties) Merging block/for-next (1e7f0a3fa85c 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 (e3b1fff6c051 ata: libata: drop superfluous ata_eh_analyze_tf() parameter) Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) Merging mmc/next (9e80f489478c 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 (233cb8a47d65 power: supply: mt6370: Add MediaTek MT6370 charger driver) CONFLICT (content): Merge conflict in drivers/power/supply/cw2015_battery.c Merging regulator/for-next (e2a8fb944a7e 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 (2fe2fb4ce60b selinux: remove runtime disable message in the install_policy.sh script) Merging smack/next (f393b3fd2a4b smack: cleanup obsolete mount option flags) Merging tomoyo/master (6879c2d3b960 Merge tag 'pinctrl-v6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl) 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 (68584e380ef5 mailbox: apple: Implement poll_data() operation) Merging spi/for-next (dabe59a54857 Merge remote-tracking branch 'spi/for-6.1' into spi-next) Merging tip/master (08ed00508bc1 Merge branch into tip/master: 'x86/mm') Merging clockevents/timers/drivers/next (27b30995b75d clocksource/drivers/imx-sysctr: handle nxp,no-divider property) Merging edac/edac-for-next (166b48e4c9e2 Merge edac-misc into 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 (467e9e2ff121 rcu: Fix late wakeup when flush of bypass cblist happens (v6)) CONFLICT (content): Merge conflict in Documentation/RCU/checklist.rst Merging kvm/next (372d07084593 KVM: selftests: Fix ambiguous mov in KVM_ASM_SAFE()) Merging kvm-arm/next (bb0cca240a16 Merge branch kvm-arm64/single-step-async-exception into kvmarm-master/next) Merging kvms390/next (c8a0273ac80d KVM: s390: Pass initialized arg even if unused) Merging xen-tip/linux-next (ce6b8ccdef95 xen/xenbus: fix xenbus_setup_ring()) 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 (9af48b262675 platform/x86/amd: pmc: Fix build without debugfs) CONFLICT (content): Merge conflict in drivers/acpi/acpi_video.c CONFLICT (content): Merge conflict in drivers/platform/mellanox/mlxreg-lc.c Merging chrome-platform/for-next (8edd2752b0aa platform/chrome: cros_ec: Notify the PM of wake events during resume) Merging hsi/for-next (811908159e7e HSI: nokia-modem: Replace of_gpio_count() by gpiod_count()) Merging leds/for-next (31fd71083023 dt-bindings: leds: Document mmc trigger) $ git reset --hard HEAD^ Merging next-20220921 version of leds Merging ipmi/for-next (6f65540b22af ipmi: kcs: aspeed: Update port address comments) CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_ipmb.c Merging driver-core/driver-core-next (a791dc135325 Merge 6.0-rc5 into driver-core-next) Merging usb/usb-next (715a654bc65c Merge tag 'usb-serial-6.1-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next) Merging thunderbolt/next (387a42cfcf92 thunderbolt: Fix spelling mistake "simultaneusly" -> "simultaneously") Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (6b2fe3df7c0c USB: serial: ftdi_sio: clean up driver prefix) Merging tty/tty-next (ccf3a570410a termios: kill uapi termios.h that are identical to generic one) CONFLICT (content): Merge conflict in drivers/usb/serial/ftdi_sio.c Merging char-misc/char-misc-next (f47551bd6bfd Merge tag 'gnss-6.1-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss into char-misc-next) Merging coresight/next (5fc1531dd771 hwtracing: hisi_ptt: Fix up for "iommu/dma: Make header private") Merging fpga/for-next (41d26c020cb2 fpga: m10bmc-sec: Fix possible memory leak of flash_buf) Merging icc/icc-next (7360d55ba199 Merge branch 'icc-ignore-return-val' into icc-next) Merging iio/togreg (6d965885f4ea iio: adc: mcp3911: add support for oversampling ratio) Merging phy-next/next (1fbef61beaad phy: ti: phy-j721e-wiz: stop name conflict if multiple serdes are initialized) Merging soundwire/next (503ae285944a soundwire: intel: add helper to stop bus) CONFLICT (content): Merge conflict in drivers/soundwire/qcom.c 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 (3c28a76124b2 vfio: Add struct device to vfio_device) Merging staging/staging-next (9634b371b66a staging: wlan-ng: remove unused p80211wext_handler_def declaration) Merging counter-next/counter-next (f95ec98139dc counter: interrupt-cnt: Implement watch_validate callback) 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 (b17671d204f7 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 (6655baa4fe8d Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging gpio-brgl/gpio/for-next (792f494e4a00 dt-binding: gpio: publish binding IDs under dual license) 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 (ee6cac37368b pinctrl: cy8c95x0: Align function names in cy8c95x0_pmxops) 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 (60bbaad38109 nvmem: u-boot-env: fix crc32 casting type) 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 (6dce3468a04c RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter) 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 (e4e9631b2c88 bus: mhi: host: always print detected modem name) Merging memblock/for-next (3e4519b7afc2 memblock tests: add generic NUMA tests for memblock_alloc_try_nid*) 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 (d515ed00e9b6 efi/arm64: libstub: avoid SetVirtualAddressMap() when possible) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (96681c855257 Merge branch 'slab/for-6.0/fixes' into slab/for-next) Merging random/master (e28a1d1ddc09 random: clamp credited irq bits to maximum mixed) 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 (6333cb31a711 tools: sync find_bit() implementation) Merging hte/for-next (568035b01cfb Linux 6.0-rc1) Merging kspp/for-next/kspp (1b64daf413ac ARM: decompressor: Include .data.rel.ro.local) 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 (19a410d57342 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 tools/testing/selftests/vm/hmm-tests.c Applying: mm/slab: fix up for "mm: kmsan: call KMSAN hooks from SLUB code" Applying: crypto: x86: kmsan: disable accelerated configs in KMSAN builds Applying: Revert "drm/msm/gem: Evict active GEM objects when necessary" Applying: fix up for "mm/hwpoison: introduce per-memory_block hwpoison counter" Applying: Revert "coding-style.rst: document BUG() and WARN() rules ("do not crash the kernel")"
Attachment:
pgp3eyngLYSTm.pgp
Description: OpenPGP digital signature
