Hi all, Changes since 20220815: Undropped tree: mfd The amdgpu tree still had its build failures for which I have reverted a commit. The vhost tree gained a build failure so I used the version from next-20220815. Non-merge commits (relative to Linus' tree): 913 937 files changed, 38537 insertions(+), 9332 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 357 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 (568035b01cfb Linux 6.0-rc1) Merging fixes/fixes (4a57a8400075 vf/remap: return the amount of bytes actually deduplicated) Merging mm-hotfixes/mm-hotfixes-unstable (93c46a2d4772 kprobes: don't call disarm_kprobe() for disabled kprobes.) Merging kbuild-current/fixes (39bdf9628782 scripts/Makefile.extrawarn: Do not disable clang's -Wformat-zero-length) Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name) Merging arm-current/fixes (ec85bd369fd2 ARM: findbit: fix overflowing offset) Merging arm64-fixes/for-next/fixes (568035b01cfb Linux 6.0-rc1) Merging arm-soc-fixes/arm/fixes (3cbd67384677 MAINTAINERS: add the Polarfire SoC's i2c driver) Merging drivers-memory-fixes/fixes (1332661e0930 memory: samsung: exynos5422-dmc: Fix refcount leak in of_get_dram_timings) 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 (83ee9f23763a powerpc/kexec: Fix build failure from uninitialised variable) Merging s390-fixes/fixes (0fef40be5d1f s390/ap: fix crash on older machines based on QCI info missing) 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 (5061e34c6744 Merge branch 'mlxsw-fixes') Merging bpf/master (58ca14ed98c8 xsk: Fix corrupted packets for XDP_SHARED_UMEM) Merging ipsec/master (ba953a9d89a0 af_key: Do not call xfrm_probe_algs in parallel) 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 (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging wireless/for-next (bc3c8fe3c79b plip: avoid rcu debug splat) Merging rdma-fixes/for-rc (568035b01cfb Linux 6.0-rc1) Merging sound-current/for-linus (461122b999bd ALSA: hda/realtek: Add quirks for ASUS Zenbooks using CS35L41) Merging sound-asoc-fixes/for-linus (ea75deef1a73 ASoC: cs42l42: Only report button state if there was a button interrupt) Merging regmap-fixes/for-linus (568035b01cfb Linux 6.0-rc1) Merging regulator-fixes/for-linus (ac5d2f049c4b Merge remote-tracking branch 'regulator/for-5.20' into regulator-6.0) Merging spi-fixes/for-linus (46f7ac3d7892 spi: bitbang: Fix lsb-first Rx) Merging pci-current/for-linus (568035b01cfb Linux 6.0-rc1) Merging driver-core.current/driver-core-linus (568035b01cfb Linux 6.0-rc1) Merging tty.current/tty-linus (568035b01cfb Linux 6.0-rc1) Merging usb.current/usb-linus (568035b01cfb Linux 6.0-rc1) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (ff6992735ade Linux 5.19-rc7) Merging phy/fixes (f2906aa86338 Linux 5.19-rc1) Merging staging.current/staging-linus (568035b01cfb Linux 6.0-rc1) Merging iio-fixes/fixes-togreg (31a08a9202e9 dt-bindings: iio: gyroscope: bosch,bmg160: correct number of pins) Merging counter-fixes/fixes-togreg (568035b01cfb Linux 6.0-rc1) Merging char-misc.current/char-misc-linus (568035b01cfb Linux 6.0-rc1) Merging soundwire-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging thunderbolt-fixes/fixes (568035b01cfb Linux 6.0-rc1) Merging input-current/for-linus (425fe4709c76 Input: goodix - add support for GT1158) Merging crypto-current/master (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL) Merging vfio-fixes/for-linus (afe4e376ac5d vfio: Move IOMMU_CAP_CACHE_COHERENCY test to after we know we have a group) Merging kselftest-fixes/fixes (5f4d1fd5b5d3 selftests/sgx: Ignore OpenSSL 3.0 deprecated functions warning) Merging modules-fixes/modules-linus (e69a66147d49 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT) Merging dmaengine-fixes/fixes (607a48c78e6b dt-bindings: dma: allwinner,sun50i-a64-dma: Fix min/max typo) 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 (3bcc2c1eade4 media: rkvdec: Disable H.264 error detection) Merging reset-fixes/reset/fixes (a57f68ddc886 reset: Fix devm bulk optional exclusive control getter) Merging mips-fixes/mips-fixes (568035b01cfb Linux 6.0-rc1) Merging at91-fixes/at91-fixes (ef0324b6415d ARM: dts: lan966x: fix sys_clk frequency) Merging omap-fixes/fixes (2eb502f496f7 ARM: dts: am33xx: Fix MMCHS0 dma properties) Merging kvm-fixes/master (19a7cc817a38 KVM: x86/MMU: properly format KVM_CAP_VM_DISABLE_NX_HUGE_PAGES capability table) Merging kvms390-fixes/master (cf5029d5dd7c KVM: x86: Protect the unused bits in MSR exiting flags) Merging hwmon-fixes/hwmon (568035b01cfb Linux 6.0-rc1) 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 (af39011ec0c7 Merge branch 'misc-5.19' into next-fixes) Merging vfs-fixes/fixes (3f61631d47f1 take care to handle NULL ->proc_lseek()) 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 (6b2caaafc5df platform/surface: aggregator_registry: Add HID devices for sensors and UCSI client to SP8) Merging samsung-krzk-fixes/fixes (c4c79525042a ARM: exynos: Fix refcount leak in exynos_map_pmu) Merging pinctrl-samsung-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging devicetree-fixes/dt/linus (8f426582e0e0 dt-bindings: chrome: google,cros-ec-typec: restrict allowed properties) Merging dt-krzk-fixes/fixes (f2906aa86338 Linux 5.19-rc1) Merging scsi-fixes/fixes (f5c2976e0cb0 scsi: ufs: core: Fix a race condition related to device management) Merging drm-fixes/drm-fixes (3d7cb6b04c3f Linux 5.19) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (3d7cb6b04c3f Linux 5.19) Merging mmc-fixes/fixes (a0753ef66c34 mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 SoC) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3) Merging hyperv-fixes/hyperv-fixes (f15f39fabed2 tools: hv: Remove an extraneous "the") Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) Merging risc-v-fixes/fixes (88bd24d73d5b riscv: compat: vdso: Fix vdso_install target) Merging risc-v-mc-fixes/dt-fixes (69dac8e431af Merge tag 'riscv-for-linus-5.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) 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 (568035b01cfb Linux 6.0-rc1) Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable) Merging pinctrl-intel-fixes/fixes (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported) Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (41a55567b9e3 module: kunit: Load .kunit_test_suites section when CONFIG_KUNIT=m) 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 (1197eb5906a5 lockd: fix nlm_close_files) Merging irqchip-fixes/irq/irqchip-fixes (a9084d888fba irqchip/loongson-liointc: Fix an error handling path in liointc_init()) CONFLICT (content): Merge conflict in arch/loongarch/include/asm/irq.h Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging broadcom-fixes/fixes (a26f045984e7 Merge branch 'devicetree/fixes' into fixes) Merging perf-current/perf/urgent (568035b01cfb Linux 6.0-rc1) Merging efi-fixes/urgent (aa6d1ed107eb efi/x86: libstub: Fix typo in __efi64_argmap* name) Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.) Merging battery-fixes/fixes (568035b01cfb Linux 6.0-rc1) Merging drm-misc-fixes/for-linux-next-fixes (82a1356a933d drm/sun4i: dsi: Prevent underflow when computing packet sizes) Merging kbuild/for-next (69dac8e431af Merge tag 'riscv-for-linus-5.20-mw2' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) Merging perf/perf/core (568035b01cfb Linux 6.0-rc1) Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn) Merging dma-mapping/for-next (5c850d31880e swiotlb: fix passing local variable to debugfs_create_ulong()) Merging asm-generic/master (82dc270146a8 Merge branch 'asm-generic-fixes' into asm-generic) Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) Merging arm/for-next (3eaecd0677e1 Merge branches 'misc' and 'fixes' into for-next) Merging arm64/for-next/core (892f7237b3ff arm64: Delay initialisation of cpuinfo_arm64::reg_{zcr,smcr}) Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING) Merging arm-soc/for-next (87a5b37a8f02 Merge branch 'arm/late' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-s3c/Kconfig.s3c64xx CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (147c83586707 Merge branch 'v5.20/drivers' into for-next) Merging aspeed/for-next (bfcbea2c93e5 ARM: dts: aspeed: nuvia: rename vendor nuvia to qcom) Merging at91/at91-next (38b729bf1ee6 Merge branch 'at91-dt' into at91-next) Merging broadcom/next (ade0d6ecf54a Merge branch 'drivers/next' into next) Merging drivers-memory/for-next (1b33eb4acdc8 Merge branch 'for-v5.20/mem-ctrl-next-late' into for-next) Merging imx-mxs/for-next (37960df982d0 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (5281655db0e1 Merge branch 'v5.19-next/soc' into for-next) Merging mvebu/for-next (bc50bfd4f018 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (ad2fe4582c48 Merge branches 'omap-for-v5.20/omap1', 'omap-for-v5.20/ti-sysc' and 'omap-for-v5.20/soc' into for-next) Merging qcom/for-next (58b9ca29ff61 Merge branches 'arm64-for-5.20', 'arm64-defconfig-for-5.20', 'clk-for-5.20', 'dts-for-5.20', 'dts-fixes-for-5.19' and 'drivers-for-5.20' into for-next) Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) Merging renesas/next (a856c5f26440 Merge branches 'renesas-arm-dt-for-v6.1' and 'renesas-drivers-for-v6.1' into renesas-next) Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") Merging rockchip/for-next (2e1170c71ec0 Merge branch 'v5.20-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (5642cb8ce0f1 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (3d7cb6b04c3f Linux 5.19) Merging stm32/stm32-next (4b43ff02d2a4 ARM: dts: stm32: Add ST MIPID02 bindings to AV96) Merging sunxi/sunxi/for-next (3a83b092dd59 Merge branch 'sunxi/dt-for-5.20' into sunxi/for-next) Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next) Merging tegra/for-next (393c6c3a6152 Merge branch for-5.20/arm64/defconfig into for-next) Merging ti/ti-next (62b9e4033c13 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) Merging xilinx/for-next (b2a88c212e65 Merge tag 'xfs-5.20-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging clk/clk-next (08fc500fe3d4 Merge branch 'clk-allwinner' into clk-next) Merging clk-imx/for-next (c196175acdd3 clk: imx: clk-fracn-gppll: Add more freq config for video pll) Merging clk-renesas/renesas-clk (32fb5425547b clk: renesas: r8a779f0: Add CMT 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 (715355922212 docs/zh_CN/LoongArch: Add I14 description) Merging m68k/for-next (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1) Merging m68knommu/for-next (568035b01cfb Linux 6.0-rc1) Merging microblaze/next (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) Merging mips/mips-next (568035b01cfb Linux 6.0-rc1) 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 (3d7cb6b04c3f Linux 5.19) Merging powerpc/next (cae4199f9319 Merge tag 'powerpc-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging soc-fsl/next (4b0986a3613c Linux 5.18) Merging risc-v/for-next (5cef38dd03f3 dt-bindings: gpio: sifive: add gpio-line-names) Merging risc-v-mc/dt-for-next (7eac0081a8e9 riscv: dts: microchip: add qspi compatible fallback) Merging s390/for-next (16acb3691091 Merge branch 'fixes' 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 (0847d167d0f9 xtensa: enable ARCH_HAS_GCOV_PROFILE_ALL) Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next) Merging fscrypt/master (a3c001190799 fscrypt: remove fscrypt_set_test_dummy_encryption()) 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 (6130a25681d4 Merge branch 'for-next-next-v5.20-20220804' into for-next-20220804) Merging ceph/master (a8af0d682ae0 libceph: clean up ceph_osdc_start_request prototype) Merging cifs/for-next (5dd8ce24667a cifs: missing directory in MAINTAINERS file) 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 (ecce9212d0fd erofs: update ctx->pos for every emitted dirent) Merging exfat/dev (df13a3477635 MAINTAINERS: Add Namjae's exfat git tree) Merging ext3/for_next (5b02b6900c8d Pull fsnotify typo fix.) Merging ext4/dev (d95efb14c0b8 ext4: add ioctls to get/set the ext4 superblock uuid) Merging f2fs/dev (5d5d353bed32 Merge tag 'rproc-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) Merging fsverity/fsverity (8da572c52a9b fs-verity: mention btrfs support) Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount) Merging gfs2/for-next (446279168e03 Merge part of branch 'for-next.instantiate' into for-next) Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code) Merging ksmbd/ksmbd-for-next (4963d74f8a6c ksmbd: request update to stale share config) Merging nfs/linux-next (5f6277a0c15e NFS: Cleanup to remove unused flag NFS_CONTEXT_RESEND_WRITES) Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking()) Merging nfsd/for-next (9905ce116c9b NFSD: fix use-after-free on source server when doing inter-server copy) Merging ntfs3/master (d4073595d0c6 fs/ntfs3: uninitialized variable in ntfs_set_acl_ex()) 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 (aa7aeee16948 net/9p: Initialize the iounit field during fid creation) 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 djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap) Merging file-locks/locks-next (9de1f9c8ca51 Merge tag 'irq-core-2022-08-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging vfs/for-next (ed5fce76b5ea vfs: escape hash as well) Merging printk/for-next (a7e796c88820 Merge branch 'for-5.20' into for-next) Merging pci/next (568035b01cfb Linux 6.0-rc1) Merging pstore/for-next/pstore (2c09d1443b9b pstore/zone: cleanup "rcnt" type) Merging hid/for-next (a60885b6a97b Merge branch 'for-5.20/uclogic' into for-linus) Merging i2c/i2c/for-next (fe99b819487d docs: i2c: i2c-sysfs: fix hyperlinks) Merging i3c/i3c/next (f2906aa86338 Linux 5.19-rc1) Merging dmi/dmi-for-next (d2139dfca361 firmware: dmi: Use the proper accessor for the version field) Merging hwmon-staging/hwmon-next (734db7976167 dt-bindings: hwmon: sparx5: use correct clock) Merging jc_docs/docs-next (339170d8d3da docs: efi-stub: Fix paths for x86 / arm stubs) Merging v4l-dvb/master (485ade76c95a media: hantro: Remove dedicated control documentation) Merging v4l-dvb-next/master (485ade76c95a media: hantro: Remove dedicated control documentation) Merging pm/linux-next (ad393690b235 Merge branch 'acpi-properties' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (33fe1cb20cf4 cpufreq: tegra194: Staticize struct tegra_cpufreq_soc instances) Merging cpupower/cpupower (568035b01cfb Linux 6.0-rc1) Merging devfreq/devfreq-next (53f853d55e31 PM / devfreq: tegra30: Add error message for devm_devfreq_add_device()) Merging opp/opp/linux-next (1d95af02f230 venus: pm_helpers: Fix warning in OPP during probe) Merging thermal/thermal/linux-next (60292c087403 Revert "mlxsw: core: Add the hottest thermal zone detection") CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlxsw/core_thermal.c Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (958589892218 fs: dlm: move kref_put assert for lkb structs) Merging rdma/for-next (568035b01cfb Linux 6.0-rc1) Merging net-next/master (7ebfc85e2cd7 Merge tag 'net-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf-next/for-next (f86d1fbbe785 Merge tag 'net-next-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging ipsec-next/master (5e25c25aa2c0 xfrm: improve wording of comment above XFRM_OFFLOAD flags) Merging mlx5-next/mlx5-next (b0bb369ee451 net/mlx5: fs, allow flow table creation with a UID) 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 (84a0a27ea39a Bluetooth: hci_event: Fix vendor (unknown) opcode status handling) Merging wireless-next/for-next (7dad3e39fde1 wifi: rtw88: prohibit enter IPS during HW scan) 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 (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL) Merging drm/drm-next (36fa1cb56ac5 Merge tag 'drm-misc-next-fixes-2022-08-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) Merging drm-misc/for-linux-next (2939deac1fa2 drm/gem: Properly annotate WW context on drm_gem_lock_reservations() error) Merging amdgpu/drm-next (268eba2b0c24 drm/amd/display: include soc._clock_tmp[] into DC's scratch region) Applying: Revert "drm/amd/display: consider DSC pass-through during mode validation" Merging drm-intel/for-linux-next (9d50bff40e3e drm/i915: pass a pointer for tlb seqno at vma_invalidate_tlb()) Merging drm-tegra/for-next (135f4c551d51 drm/tegra: vic: Use devm_platform_ioremap_resource()) Merging drm-msm/msm-next (cb77085b1f0a drm/msm/dpu: Fix for non-visible planes) Merging drm-msm-lumag/msm-next-lumag (1ff1da40d6fc Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag) Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary) Merging fbdev/for-next (ff6992735ade Linux 5.19-rc7) Merging regmap/for-next (77672e0387f9 regmap: mmio: Extending to support IO ports) Merging sound/for-next (461122b999bd ALSA: hda/realtek: Add quirks for ASUS Zenbooks using CS35L41) Merging sound-asoc/for-next (7e41d299a83d Merge remote-tracking branch 'asoc/for-6.1' into asoc-next) Merging modules/modules-next (554694ba120b module: Replace kmap() with kmap_local_page()) Merging input/next (8bd5d27d426b Input: Add IBM Operation Panel driver) Merging block/for-next (ece775e9aa82 Merge branch 'for-5.20/block' into for-next) Merging device-mapper/for-next (e3a7c2947b9e dm bufio: fix some cases where the code sleeps with spinlock held) Merging libata/for-next (b3b2bec9646e ata: sata_mv: Fixes expected number of resources now IRQs are gone) Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt) Merging mmc/next (dbdd5b72a66f Merge branch 'fixes' into next) Merging mfd/for-mfd-next (3d021aaca7c7 dt-bindings: mfd: mt8195: Add bindings for MediaTek SCPSYS) Merging backlight/for-backlight-next (fe201f6fa4cf MAINTAINERS: Use Lee Jones' kernel.org address for Backlight submissions) Merging battery/for-next (568035b01cfb Linux 6.0-rc1) Merging regulator/for-next (9b6744f60b6b regulator: Add missing devm_* functions to devres.rst) Merging security/next (568035b01cfb Linux 6.0-rc1) Merging apparmor/apparmor-next (79eb2711c919 apparmor: correct config reference to intended one) Merging integrity/next-integrity (1d212f9037b0 Merge remote-tracking branch 'linux-integrity/kexec-keyrings' into next-integrity) 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 (568035b01cfb Linux 6.0-rc1) Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc) Merging tomoyo/master (05fe531eb3f1 kernel/hung_task: show backtrace of tasks with locks held) Merging tpmdd/next (863ed94c589f tpm: Add check for Failure mode for TPM2 modules) Merging watchdog/master (2d27e5284109 watchdog: armada_37xx_wdt: check the return value of devm_ioremap() in armada_37xx_wdt_probe()) Merging iommu/next (c10100a416c1 Merge branches 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging audit/next (568035b01cfb Linux 6.0-rc1) Merging devicetree/for-next (7e7a24c3c6c9 dt-bindings: mtd: microchip,mchp48l640: use spi-peripheral-props.yaml) Merging dt-krzk/for-next (12f158808510 dt-bindings: arm: aspeed: add Aspeed Evaluation boards) Merging mailbox/mailbox-for-next (8a8dc2b9596e mailbox: imx: clear pending interrupts) Merging spi/for-next (bfbfc863fcfe Merge remote-tracking branch 'spi/for-6.1' into spi-next) Merging tip/master (3b8e4b2bb4bb 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 (5e2805d53796 EDAC/ghes: Set the DIMM label unconditionally) 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 (21714867a12a Merge branch 'lkmm-dev.2022.06.20a' into HEAD) Merging kvm/next (19a7cc817a38 KVM: x86/MMU: properly format KVM_CAP_VM_DISABLE_NX_HUGE_PAGES capability table) 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 (5ad3134dcf52 MAINTAINERS: add xen config fragments to XEN HYPERVISOR sections) Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3) Merging workqueues/for-next (3836bf266b86 workqueue: don't skip lockdep work dependency in cancel_work_sync()) Merging drivers-x86/for-next (568035b01cfb Linux 6.0-rc1) Merging chrome-platform/for-next (f74c7557ed0d platform/chrome: cros_ec_proto: Update version on GET_NEXT_EVENT failure) Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe) Merging leds/for-next (38ba0bb291aa leds: is31fl319x: use simple i2c probe function) Merging ipmi/for-next (4aebcc9059d8 dt-binding: ipmi: add fallback to npcm845 compatible) Merging driver-core/driver-core-next (568035b01cfb Linux 6.0-rc1) Merging usb/usb-next (568035b01cfb Linux 6.0-rc1) Merging thunderbolt/next (b60e31bf18a7 thunderbolt: Add DP OUT resource when DP tunnel is discovered) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (688ee1d1785c USB: serial: fix tty-port initialized comments) Merging tty/tty-next (568035b01cfb Linux 6.0-rc1) Merging char-misc/char-misc-next (568035b01cfb Linux 6.0-rc1) Merging coresight/next (4d45bc82df66 coresight: etm4x: avoid build failure with unrolled loops) Merging fpga/for-next (e167b2c3a0e6 dt-bindings: fpga: microchip,mpf-spi-fpga-mgr: use spi-peripheral-props.yaml) Merging icc/icc-next (009c963eefa0 Merge branch 'icc-rpm' into icc-next) Merging iio/togreg (b82217e73b5a iio: pressure: dlhl60d: Don't take garbage into consideration when reading data) Merging phy-next/next (08680588d340 dt-bindings: phy: mediatek: tphy: add compatible for mt8188) Merging soundwire/next (3f4a70268d54 soundwire: qcom: Enable software clock gating requirement flag) Merging extcon/extcon-next (3a06ed80265f extcon: Add EXTCON_DISP_CVBS and EXTCON_DISP_EDP) Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API) Merging vfio/next (0f3e72b5c8cf vfio: Move vfio.c to vfio_main.c) Merging staging/staging-next (568035b01cfb Linux 6.0-rc1) Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4) Merging dmaengine/next (a1873f837f9e dmaengine: mediatek: mtk-hsdma: Fix typo 'the the' in comment) Merging cgroup/for-next (8eb57231f546 Merge branch 'for-6.1' into for-next) Merging scsi/for-next (c6380f992427 scsi: pm8001: Fix typo 'the the' in comment) Merging scsi-mkp/for-next (d957e7ffb2c7 scsi: storvsc: Remove WQ_MEM_RECLAIM from storvsc_error_wq) Merging vhost/linux-next (43ab8a34f3f0 virtio: drop vp_legacy_set_queue_size) $ git reset --hard HEAD^ Merging next-20220815 version of vhost Merging rpmsg/for-next (c55988e5e96a Merge branches 'rpmsg-next' and 'hwspinlock-next' into for-next) Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging gpio-brgl/gpio/for-next (1e65d136d956 dt-bindings: gpio: fairchild,74hc595: use spi-peripheral-props.yaml) Merging gpio-intel/for-next (b65bb2c14891 gpio: pch: Change PCI device macros) Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) Merging pinctrl/for-next (5b045200b53a dt-bindings: pinctrl: qcom,pmic-gpio: add PM8226 constraints) Merging pinctrl-intel/for-next (25097de7b236 pinctrl: intel: Add Intel Meteor Lake pin controller support) Merging pinctrl-renesas/renesas-pinctrl (36611d28f513 pinctrl: renesas: r8a779g0: Add missing MODSELx for AVBx) Merging pinctrl-samsung/for-next (c98ebe065e07 pinctrl: samsung: do not use bindings header with 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 (f1227dc7d041 selftests/landlock: fix broken include of linux/landlock.h) Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next) Merging rtc/rtc-next (03c4cd6f89e0 rtc: spear: set range max) 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 (3ce4b78f73e8 selftests/seccomp: Fix compile warning when CC=clang) 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 (4ad3deabeea2 slimbus: messaging: fix typos in comments) Merging nvmem/for-next (432ee5a3cfcf nvmem: mtk-efuse: Simplify with devm_platform_get_and_ioremap_resource()) 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 (bb3c64f6a017 bus: mhi: host: Fix up null pointer access in mhi_irq_handler) Merging memblock/for-next (04d9490986d1 memblock test: Modify the obsolete description in README) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) 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 (df3c9072ef90 Merge branch 'efivars-cleanup' into efi/next) Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) Merging slab/for-next (3041808b5220 mm/slab_common: move generic bulk alloc/free functions to SLOB) Merging random/master (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux) Merging landlock/next (b13baccc3850 Linux 5.19-rc2) Merging rust/rust-next (07a3263c2554 init/Kconfig: Specify the interpreter for rust_is_available.sh) CONFLICT (content): Merge conflict in Makefile Merging sysctl/sysctl-next (374a723c7448 kernel/sysctl.c: Remove trailing white space) Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages) Merging execve/for-next/execve (c6e8e36c6ae4 exec: Call kmap_local_page() in copy_string_kernel()) Merging bitmap/bitmap-for-next (e7f31a291fbe lib/cpumask: drop always-true preprocessor guard) Merging hte/hte/for-next (85ff37e302ef gpiolib: cdev: Fix kernel doc for struct line) Merging kspp/for-next/kspp (27603a606fda dm: verity-loadpin: Drop use of dm_table_get_num_targets()) Merging kspp-gustavo/for-next/kspp (568035b01cfb Linux 6.0-rc1) Merging mm-stable/mm-stable (568035b01cfb Linux 6.0-rc1) Merging mm-nonmm-stable/mm-nonmm-stable (568035b01cfb Linux 6.0-rc1) Merging mm/mm-everything (8035c3106513 Merge branch 'mm-nonmm-unstable' into mm-everything)
Attachment:
pgp_wslgvl3IN.pgp
Description: OpenPGP digital signature
