Hi all, Please do not add any v5.16 related code to your linux-next included branches until after v5.15-rc1 has been released. Changes since 20210907: The cxl tree lost its build failure. I have cherry-picked "kbuild: Only default to -Werror if COMPILE_TEST' from Linus' tree (since it arrived after I started building linux-next today). Hopefulyl this will reduce the failures in the overnight builds. Non-merge commits (relative to Linus' tree): 1559 1741 files changed, 92190 insertions(+), 19926 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, 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 334 trees (counting Linus' and 90 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 (626bf91a292e Merge tag 'net-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging fixes/fixes (a9c9a6f741cd Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (36a21d51725a Linux 5.14-rc5) Merging arc-current/for-curr (7c60610d4767 Linux 5.14-rc6) Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression) Merging arm64-fixes/for-next/fixes (3eb9cdffb397 Partially revert "arm64/mm: drop HAVE_ARCH_PFN_VALID") Merging arm-soc-fixes/arm/fixes (6c35ca069741 Merge tag 'reset-fixes-for-v5.14' of git://git.pengutronix.de/pza/linux into arm/fixes) Merging drivers-memory-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging m68k-current/for-linus (87d93029fe83 m68k: Fix asm register constraints for atomic ops) Merging powerpc-fixes/fixes (787c70f2f999 powerpc/64s: Fix scv implicit soft-mask table for relocated kernels) Merging s390-fixes/fixes (c7a5238ef68b Merge tag 's390-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (626bf91a292e Merge tag 'net-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf/master (3a029e1f3d6e selftests/bpf: Fix build of task_pt_regs test for arm64) Merging ipsec/master (b539c44df067 net: wwan: iosm: Unify IO accessors used in the driver) Merging netfilter/master (ecbd690b52dc octeontx2-af: Fix some memory leaks in the error handling path of 'cgx_lmac_init()') Merging ipvs/master (e3245a7b7b34 netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex) Merging wireless-drivers/master (e4457a45b41c iwlwifi: fix printk format warnings in uefi.c) Merging mac80211/master (57f780f1c433 atlantic: Fix driver resume flow.) Merging rdma-fixes/for-rc (cc4f596cf85e RDMA/rxe: Zero out index member of struct rxe_queue) Merging sound-current/for-linus (c5433f026b27 ALSA: gus: Fix repeated probe for ISA interwave card) Merging sound-asoc-fixes/for-linus (bf342ee5e443 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) Merging regmap-fixes/for-linus (e22ce8eb631b Linux 5.14-rc7) Merging regulator-fixes/for-linus (7cb623f775d5 Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus) Merging spi-fixes/for-linus (34014d01dd27 Merge remote-tracking branch 'spi/for-5.15' into spi-linus) Merging pci-current/for-linus (045a9277b561 PCI/sysfs: Use correct variable for the legacy_mem sysfs object) Merging driver-core.current/driver-core-linus (4b93c544e90e thunderbolt: test: split up test cases in tb_test_credit_alloc_all) Merging tty.current/tty-linus (49624efa65ac Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux) Merging usb.current/usb-linus (4b93c544e90e thunderbolt: test: split up test cases in tb_test_credit_alloc_all) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (dcf097e7d21f USB: serial: pl2303: fix GL type detection) Merging usb-chipidea-fixes/for-usb-fixes (5df09c15bab9 usb: cdnsp: Fix the IMAN_IE_SET and IMAN_IE_CLEAR macro) Merging phy/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging staging.current/staging-linus (4b93c544e90e thunderbolt: test: split up test cases in tb_test_credit_alloc_all) Merging iio-fixes/fixes-togreg (ce9e3d5989e5 iio: adc128s052: Fix the error handling path of 'adc128_probe()') Merging char-misc.current/char-misc-linus (ba1dc7f273c7 Merge tag 'char-misc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging thunderbolt-fixes/fixes (7d2a07b76933 Linux 5.14) Merging input-current/for-linus (ab108678195f Input: mms114 - support MMS134S) Merging crypto-current/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables) Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow) Merging kselftest-fixes/fixes (567c39047dbe selftests/sgx: Fix Q1 and Q2 calculation in sigstruct.c) Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) Merging dmaengine-fixes/fixes (7199ddede9f0 dmaengine: imx-dma: configure the generic DMA type to make it work) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (b48027083a78 mtd: rawnand: Fix probe failure due to of_get_nand_secure_regions()) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (3ad02c27d89d media: s5p-jpeg: rename JPEG marker constants to prevent build warnings) Merging reset-fixes/reset/fixes (ed104ca4bd9c reset: reset-zynqmp: Fixed the argument data type) Merging mips-fixes/mips-fixes (6aa32467299e MIPS: check return value of pgtable_pmd_page_ctor) Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1) Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc()) Merging kvm-fixes/master (7d2a07b76933 Linux 5.14) Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test) Merging hwmon-fixes/hwmon (15d4ec3b12b5 hwmon: (k10temp) Remove residues of current and voltage) Merging nvdimm-fixes/libnvdimm-fixes (32b2397c1e56 libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) Merging btrfs-fixes/next-fixes (7f6fe94c91a4 Merge branch 'misc-5.15' into next-fixes) Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx()) Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (1e35b8a7780a platform/x86: gigabyte-wmi: add support for B450M S2H V2) Merging samsung-krzk-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging pinctrl-samsung-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging devicetree-fixes/dt/linus (50d8d7e19c43 dt-bindings: display: renesas,du: Make resets optional on R-Car H1) Merging scsi-fixes/fixes (02c6dcd543f8 scsi: core: Fix hang of freezing queue between blocking and running device) Merging drm-fixes/drm-fixes (7d2a07b76933 Linux 5.14) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (7d2a07b76933 Linux 5.14) Merging mmc-fixes/fixes (b81bede4d138 mmc: renesas_sdhi: fix regression with hard reset on old SDHIs) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1) Merging hyperv-fixes/hyperv-fixes (f1940d4e9cbe Drivers: hv: vmbus: Fix kernel crash upon unbinding a device from uio_hv_generic driver) Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning) Merging risc-v-fixes/fixes (7d2a07b76933 Linux 5.14) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (1d345c3e5941 fpga: machxo2-spi: Fix missing error code in machxo2_write_complete()) Merging spdx/spdx-linus (49624efa65ac Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux) Merging gpio-brgl-fixes/gpio/for-current (9b87f43537ac gpio: tqmx86: really make IRQ optional) Merging gpio-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1) Merging pinctrl-intel-fixes/fixes (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software) Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (2734d6c1b1a0 Linux 5.14-rc2) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) Merging memblock-fixes/fixes (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM) Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12) Merging irqchip-fixes/irq/irqchip-fixes (0ddc5e55e6f1 Documentation: Fix irq-domain.rst build warning) Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles) Merging drm-misc-fixes/for-linux-next-fixes (c8704b7ec182 drm/kmb: Enable alpha blended second plane) Merging kspp-gustavo/for-next/kspp (7bc04ce6b914 Makefile: Enable -Wimplicit-fallthrough for Clang) Merging kbuild/for-next (5a1f175c9aca isystem: delete global -isystem compile option) Applying: drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers" Merging compiler-attributes/compiler-attributes (7ed012969bbc Compiler Attributes: fix __has_attribute(__no_sanitize_coverage__) for GCC 4) CONFLICT (content): Merge conflict in include/linux/compiler_attributes.h Merging dma-mapping/for-next (a61cb6017df0 dma-mapping: fix the kerneldoc for dma_map_sg_attrs) Merging asm-generic/master (8f76f9c46952 bitops/non-atomic: make @nr unsigned to avoid any DIV) Merging arc/for-next (56809a28d45f ARC: mm: vmalloc sync from kernel to user table to update PMD ...) Merging arm/for-next (1c9b5911f53b Merge branches 'fixes' and 'misc' into for-next) CONFLICT (content): Merge conflict in ipc/sem.c Merging arm64/for-next/core (65266a7c6abf Merge remote-tracking branch 'tip/sched/arm64' into for-next/core) Merging arm-perf/for-next/perf (fd264b310579 arm64/perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF) Merging arm-soc/for-next (5e115b419d2b soc: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (6285af2a2821 Merge tags 'amlogic-arm-configs-for-v5.15', 'amlogic-arm64-dt-for-v5.15' and 'amlogic-arm-dt-for-v5.15' into for-next) Merging aspeed/for-next (0f32f00af344 Merge branches 'dt-for-v5.15', 'soc-for-v5.15' and 'defconfig-for-v5.15' into for-next) Merging at91/at91-next (b102356e5bc1 Merge branch 'at91-dt' into at91-next) Merging drivers-memory/for-next (c28b584deb1b Merge branch 'for-v5.15/omap-gpmc' into for-next) Merging imx-mxs/for-next (2cb411d89676 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) Merging mediatek/for-next (69862ae4e378 Merge branch 'v5.14-next/soc' into for-next) Merging mvebu/for-next (930af8dda750 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (7911f95d1713 Merge branch 'fixes' into for-next) Merging qcom/for-next (e0f999d1bfc1 Merge branches 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' into for-next) Merging raspberrypi/for-next (9f5289ec6f1c ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address) Merging renesas/next (59d7f78144a8 Merge branches 'renesas-arm-dt-for-v5.15' and 'renesas-drivers-for-v5.15' into renesas-next) Merging reset/reset/next (09f3824342f6 reset: simple: remove ZTE details in Kconfig help) Merging rockchip/for-next (d46148623f26 Merge branch 'v5.15-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (90861bf54255 Merge branch 'next/dt64' into for-next) Merging scmi/for-linux-next (7c414a7d93c6 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (1e6bc5987a52 ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check) Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next) Merging tegra/for-next (cc701ccede61 Merge branch for-5.15/arm64/dt into for-next) Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) Merging ti-k3-new/ti-k3-next (c1fa5ac6c2f4 arm64: dts: ti: k3-am642-sk: Add pwm nodes) Merging xilinx/for-next (4d7e3c8de98e Merge branch 'zynqmp/dt' of https://github.com/Xilinx/linux-xlnx into for-next) Merging clk/clk-next (2cfa946be843 clk: qcom: gcc-sm6350: Remove unused variable) Merging clk-imx/for-next (86842d255b45 clk: imx8mn: Add M7 core clock) Merging clk-renesas/renesas-clk (e8425dd55abb clk: renesas: Make CLK_R9A06G032 invisible) Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects) Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs) Merging m68k/for-next (87d93029fe83 m68k: Fix asm register constraints for atomic ops) Merging m68knommu/for-next (db87db65c105 m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch) Merging microblaze/next (315511166469 microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild) Merging mips/mips-next (bea6a94a279b MIPS: Malta: fix alignment of the devicetree buffer) Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>) Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) Merging openrisc/for-next (1955d843efc3 openrisc/litex: Update defconfig) Merging parisc-hd/for-next (a9ab1f50b6ca parisc: Reduce sigreturn trampoline to 3 instructions) Merging powerpc/next (a3314262eede Merge branch 'fixes' into next) Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) Merging risc-v/for-next (063df71a574b Merge tag 'riscv-for-linus-5.15-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging s390/for-next (7d665612dd5a s390/hmcdrv_ftp: fix kernel doc comment) Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable) 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 (adf9ae0d159d um: fix stub location calculation) Merging xtensa/xtensa-for-next (7b7cec477fc3 xtensa: move core-y in arch/xtensa/Makefile to arch/xtensa/Kbuild) Merging pidfd/for-next (f4dd02cd8631 Merge branch 'kernel.sys' into for-next) Merging fscrypt/master (38ef66b05cfa fscrypt: document struct fscrypt_operations) Merging fscache/fscache-next (20ec197bfa13 fscache: Use refcount_t for the cookie refcount instead of atomic_t) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") Merging btrfs/for-next (1efc6199e6b9 Merge branch 'for-next-current-v5.14-20210830' into for-next-20210830) Merging ceph/master (4b0b8836ebba ceph: fix off by one bugs in unsafe_request_wait()) Merging cifs/for-next (f748b57ebfc5 cifs: move NEGOTIATE_PROTOCOL definitions out into the common area) Merging cifsd/cifsd-for-next (303fff2b8c77 ksmbd: add validation for ndr read/write functions) Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup()) 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 (1266b4a7ecb6 erofs: fix double free of 'copied') Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block) Merging ext3/for_next (ed518dd035fa Pull udf xattr sanity checks.) Merging ext4/dev (baaae979b112 ext4: make the updating inode data procedure atomic) Merging f2fs/dev (1dbe7e386f50 Merge tag 'block-5.15-2021-09-05' of git://git.kernel.dk/linux-block) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (a9667ac88e2b fuse: remove unused arg in fuse_write_file_get()) Merging gfs2/for-next (08d736667185 gfs2: Remove redundant check from gfs2_glock_dq) Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy()) Merging nfs/linux-next (2734d6c1b1a0 Linux 5.14-rc2) Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers) Merging nfsd/nfsd-next (e22ce8eb631b Linux 5.14-rc7) Merging cel/for-next (0c217d5066c8 SUNRPC: improve error response to over-size gss credential) Merging ntfs3/master (2e3a51b59ea2 fs/ntfs3: Change how module init/info messages are displayed) Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.) Merging overlayfs/overlayfs-next (332f606b32b6 ovl: enable RCU'd ->get_acl()) Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode) Merging v9fs/9p-next (9c4d94dc9a64 net/9p: increase default msize to 128k) Merging xfs/for-next (f38a032b165d xfs: fix I_DONTCACHE) Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check) Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage) Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID) Merging file-locks/locks-next (b91db6a0b52e Merge tag 'for-5.15/io_uring-vfs-2021-08-30' of git://git.kernel.dk/linux-block) Merging vfs/for-next (8e222b83dec2 Merge branch 'work.iov_iter' into for-next) Merging printk/for-next (9980c4251f8d printk: use kvmalloc instead of kmalloc for devkmsg_user) Merging pci/next (742a4c49a82a Merge branch 'remotes/lorenzo/pci/tools') CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnxt/bnxt.c CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnx2.c CONFLICT (content): Merge conflict in MAINTAINERS Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long) Merging hid/for-next (4bc44ba4871f Merge branch 'for-5.15/core' into for-next) Merging i2c/i2c/for-next (cc1dbdeb17dd Merge branch 'i2c/for-mergewindow' into i2c/for-next) Merging i3c/i3c/next (e73f0f0ee754 Linux 5.14-rc1) Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) Merging hwmon-staging/hwmon-next (15d4ec3b12b5 hwmon: (k10temp) Remove residues of current and voltage) Merging jc_docs/docs-next (7c5c18bdb656 docs: pdfdocs: Fix typo in CJK-language specific font settings) Merging v4l-dvb/master (9c3a0f285248 Merge tag 'v5.14-rc4' into media_tree) Merging v4l-dvb-next/master (d62cd4d277cc media: uvcvideo: Remove unused including <linux/version.h>) Merging pm/linux-next (54f9cb2466e1 Merge branch 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (4855e26bcf4d cpufreq: mediatek-hw: Add support for CPUFREQ HW) Merging cpupower/cpupower (5499f2b80b56 tools: cpupower: fix typo in cpupower-idle-set(1) manpage) Merging devfreq/devfreq-next (e73f0f0ee754 Linux 5.14-rc1) Merging opp/opp/linux-next (94274f20f6bf dt-bindings: opp: Convert to DT schema) Merging thermal/thermal/linux-next (da6deb655a58 thermal/drivers/qcom/spmi-adc-tm5: Don't abort probing if a sensor is not used) Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) Merging dlm/next (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace) Merging swiotlb/linux-next (f3c4b1341e83 swiotlb: use depends on for DMA_RESTRICTED_POOL) Merging rdma/for-next (6a217437f9f5 Merge branch 'sg_nents' into rdma.git for-next) Merging net-next/master (626bf91a292e Merge tag 'net-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging bpf-next/for-next (27151f177827 Merge tag 'perf-tools-for-v5.15-2021-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux) Merging ipsec-next/master (9e9fb7655ed5 Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging mlx5-next/mlx5-next (598fe77df855 net/mlx5: Lag, Create shared FDB when in switchdev mode) Merging netfilter-next/master (9e9fb7655ed5 Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging ipvs-next/master (7bc416f14716 netfilter: x_tables: handle xt_register_template() returning an error value) Merging wireless-drivers-next/master (eaf2aaec0be4 Merge tag 'wireless-drivers-next-2021-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next) Merging bluetooth/master (9682d36c2119 Bluetooth: hci_vhci: Add support for offload codecs over SCO) Merging mac80211-next/master (464a57281f29 net/mlxbf_gige: Make use of devm_platform_ioremap_resourcexxx()) Merging mtd/mtd/next (c1fe77e42440 Merge tag 'nand/for-5.15' into mtd/next) Merging nand/nand/next (6b430c7595e4 mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()') Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2) Merging crypto/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables) Merging drm/drm-next (1645cca9da91 drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers") Merging drm-misc/for-linux-next (87fd9ef47597 dma-buf: DMABUF_SYSFS_STATS should depend on DMA_SHARED_BUFFER) Merging amdgpu/drm-next (1258fee6e4d3 drm/sched: fix the bug of time out calculation(v4)) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c Merging drm-intel/for-linux-next (fb43ebc83e06 drm/i915/selftest: Fix use of err in igt_reset_{fail, nop}_engine()) Merging drm-tegra/drm/tegra/for-next (fed028939417 gpu: host1x: debug: Dump DMASTART and DMAEND register) Merging drm-msm/msm-next (cb0927ab80d2 drm/msi/mdp4: populate priv->kms in mdp4_kms_init) Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource()) Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function) Merging regmap/for-next (ca5537c9be13 Merge remote-tracking branch 'regmap/for-5.15' into regmap-next) Merging sound/for-next (c5433f026b27 ALSA: gus: Fix repeated probe for ISA interwave card) Merging sound-asoc/for-next (bf342ee5e443 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) Merging input/next (daf87bffd02e Input: palmas-pwrbutton - handle return value of platform_get_irq()) Merging block/for-next (fe8452804ee2 Merge branch 'block-5.15' into for-next) Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq()) Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) Merging mmc/next (b81bede4d138 mmc: renesas_sdhi: fix regression with hard reset on old SDHIs) Merging mfd/for-mfd-next (cdff1eda6932 mfd: lpc_sch: Rename GPIOBASE to prevent build error) Merging backlight/for-backlight-next (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover) Merging battery/for-next (c9398455b046 power: supply: core: Fix parsing of battery chemistry/technology) Merging regulator/for-next (7cb623f775d5 Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus) Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing) Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) Merging integrity/next-integrity (cb181da16196 IMA: reject unknown hash algorithms in ima_get_hash_algo) Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring) CONFLICT (content): Merge conflict in certs/system_keyring.c Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata) Merging selinux/next (893c47d1964f selinux: return early for possible NULL audit buffers) Merging smack/next (bfc3cac0c761 smack: mark 'smack_enabled' global variable as __initdata) Merging tomoyo/master (7d2a07b76933 Linux 5.14) Merging tpmdd/next (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion) Merging watchdog/master (41e73feb1024 dt-bindings: watchdog: Add compatible for Mediatek MT7986) Merging iommu/next (d8768d7eb9c2 Merge branches 'apple/dart', 'arm/smmu', 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging audit/next (67d69e9d1a6c audit: move put_tree() to avoid trim_trees refcount underflow and UAF) Merging devicetree/for-next (b1e202503508 dt-bindings: display: remove zte,vou.txt binding doc) Merging mailbox/mailbox-for-next (85dfdbfc13ea mailbox: cmdq: add multi-gce clocks support for mt8195) Merging spi/for-next (34014d01dd27 Merge remote-tracking branch 'spi/for-5.15' into spi-linus) Merging tip/auto-latest (ee0f507188b8 Merge branch 'x86/urgent') Merging clockevents/timers/drivers/next (f196ae282070 dt-bindings: timer: Add ABIs for new Ingenic SoCs) Merging edac/edac-for-next (cf4e6d52f583 EDAC/i10nm: Retrieve and print retry_rd_err_log registers) Merging irqchip/irq/irqchip-next (6e3b473ee064 Merge branch irq/qcom-pdc-nowake-cleanup into irq/irqchip-next) Merging ftrace/for-next (4420f5b1be7b tracing/doc: Fix table format in histogram code) Merging rcu/rcu/next (38babc43f45e rcutorture: Avoid problematic critical section nesting on PREEMPT_RT) CONFLICT (content): Merge conflict in kernel/time/tick-internal.h Merging kvm/next (109bbba5066b KVM: Drop unused kvm_dirty_gfn_invalid()) Merging kvm-arm/next (419025b3b419 Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next) Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests) Merging kvms390/next (a3e03bc1368c KVM: s390: index kvm->arch.idle_mask by vcpu_idx) Merging xen-tip/linux-next (58e636039b51 xen: remove stray preempt_disable() from PV AP startup code) Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) Merging workqueues/for-next (bdb0a6548d22 workqueue: Remove unused WORK_NO_COLOR) Merging drivers-x86/for-next (0487d4fc42d7 platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call) Merging chrome-platform/for-next (4665584888ad platform/chrome: cros_ec_trace: Fix format warnings) Merging hsi/for-next (e73f0f0ee754 Linux 5.14-rc1) Merging leds/for-next (239f32b4f161 leds: pca955x: Switch to i2c probe_new) Merging ipmi/for-next (bf064c7bec3b char: ipmi: use DEVICE_ATTR helper macro) Merging driver-core/driver-core-next (4b93c544e90e thunderbolt: test: split up test cases in tb_test_credit_alloc_all) Merging usb/usb-next (4b93c544e90e thunderbolt: test: split up test cases in tb_test_credit_alloc_all) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (a65ab973c166 USB: serial: replace symbolic permissions by octal permissions) Merging usb-chipidea-next/for-usb-next (e5d6a7c6cfae usb: chipidea: host: fix port index underflow and UBSAN complains) Merging tty/tty-next (49624efa65ac Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux) Merging char-misc/char-misc-next (4cd67adc44a3 Merge tag 'misc-habanalabs-next-2021-09-01' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-next) Merging extcon/extcon-next (07de34f5ce1e extcon: max3355: Drop unused include) Merging phy-next/next (152a810eae03 phy: qcom-qmp: Add support for SM6115 UFS phy) Merging soundwire/next (2564a2d4418b soundwire: cadence: do not extend reset delay) Merging thunderbolt/next (42716425ad7e thunderbolt: Fix port linking by checking all adapters) Merging vfio/next (ea870730d83f Merge branches 'v5.15/vfio/spdx-license-cleanups', 'v5.15/vfio/dma-valid-waited-v3', 'v5.15/vfio/vfio-pci-core-v5' and 'v5.15/vfio/vfio-ap' into v5.15/vfio/next) Merging staging/staging-next (4b93c544e90e thunderbolt: test: split up test cases in tb_test_credit_alloc_all) Merging iio/togreg (d484c21bacfa iio: adc: Add driver for Renesas RZ/G2L A/D converter) Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging icc/icc-next (8bf5d31c4f06 interconnect: qcom: osm-l3: Use driver-specific naming) Merging dmaengine/next (11a427be2c47 dmaengine: sh: fix some NULL dereferences) Merging cgroup/for-next (96aff80dde1b Merge branch 'for-5.15' into for-next) Merging scsi/for-next (27f681116fdf Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (9b5ac8ab4e8b scsi: ufs: Fix ufshcd_request_sense_async() for Samsung KLUFG8RHDA-B2D1) Merging vhost/linux-next (7bc7f61897b6 Documentation: Add documentation for VDUSE) CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h CONFLICT (content): Merge conflict in fs/eventfd.c CONFLICT (content): Merge conflict in drivers/virtio/virtio.c Applying: fix up for "eventfd: Make signal recursion protection a task bit" Merging rpmsg/for-next (c93ca5f21d93 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) Merging gpio-brgl/gpio/for-next (889a1b3f35db gpio: mpc8xxx: Use 'devm_gpiochip_add_data()' to simplify the code and avoid a leak) Merging gpio-intel/for-next (5111c2b6b019 gpio: dwapb: Get rid of legacy platform data) Merging pinctrl/for-next (04853352952b Merge tag 'samsung-pinctrl-5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel) Merging pinctrl-intel/for-next (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software) Merging pinctrl-renesas/renesas-pinctrl (c4c4637eb57f pinctrl: renesas: Add RZ/G2L pin and gpio controller driver) Merging pinctrl-samsung/for-next (cdd3d945dcec pinctrl: samsung: Add Exynos850 SoC specific data) Merging pwm/for-next (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state()) Merging userns/for-next (a3be01837fc9 Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 for testing in linux-next) CONFLICT (content): Merge conflict in include/linux/sched/signal.h Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (67d6d80d90fb selftests/cpufreq: Rename DEBUG_PI_LIST to DEBUG_PLIST) Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next) Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) Merging rtc/rtc-next (8158da6a33f2 dt-bindings: rtc: add Epson RX-8025 and RX-8035) Merging nvdimm/libnvdimm-for-next (bdd3c50d83bf dax: remove bdev_dax_supported) Applying: fixup for "dax: remove bdev_dax_supported" Merging at24/at24/for-next (658ae44345c1 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05) Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data) Merging seccomp/for-next/seccomp (b4d8a58f8dcf seccomp: Fix setting loaded filter count during TSYNC) Merging kspp/for-next/kspp (f83aa11731bd Merge branch 'for-next/overflow' into for-next/kspp) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons) Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout) Merging slimbus/for-next (e5c578adcdd9 slimbus: ngd: reset dma setup during runtime pm) Merging nvmem/for-next (74f671aed9e7 nvmem: core: Add stubs for nvmem_cell_read_variable_le_u32/64 if !CONFIG_NVMEM) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) Merging hyperv/hyperv-next (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer) Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions) Merging kgdb/kgdb/for-next (f8416aa29185 kernel: debug: Convert to SPDX identifier) Merging hmm/hmm (79fbd3e1241c RDMA: Use the sg_table directly and remove the opencoded version from umem) Merging fpga/for-next (4f45f3404960 spi: spi-altera-dfl: support n5010 feature revision) Merging kunit/test (e73f0f0ee754 Linux 5.14-rc1) Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3) Merging kunit-next/kunit (acd8e8407b8f kunit: Print test statistics on failure) Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging mhi/mhi-next (813272ed5238 Merge 5.14-rc5 into char-misc-next) Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) Merging rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust) CONFLICT (content): Merge conflict in include/linux/kallsyms.h CONFLICT (content): Merge conflict in Makefile Applying: fixup for rust integration with Makefile.clang creation Merging cxl/next (2b922a9d064f cxl/registers: Fix Documentation warning) Merging folio/for-next (1a90e9dae32c mm/writeback: Add folio_write_one) CONFLICT (content): Merge conflict in mm/util.c CONFLICT (content): Merge conflict in mm/rmap.c CONFLICT (content): Merge conflict in mm/page-writeback.c CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in mm/filemap.c CONFLICT (content): Merge conflict in include/linux/memcontrol.h Merging akpm-current/current (ec14ea3dfa14 ipc: replace costly bailout check in sysvipc_find_ipc()) CONFLICT (content): Merge conflict in include/linux/units.h CONFLICT (content): Merge conflict in include/linux/sched.h $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (62ebbd49a519 arch: remove compat_alloc_user_space) Applying: kbuild: Only default to -Werror if COMPILE_TEST
Attachment:
pgpUPojsEbIDJ.pgp
Description: OpenPGP digital signature
