Hi all, Changes since 20210914: Linus' tree lost its build failure. The net-next tree lost its build failure. The bpf-next tree still had its build failure so I used the version from next-20210913. The ftrace tree gained a conflict against Linus' tree. The xen-tip tree gained a build failure so I used the version from next-20210914. Non-merge commits (relative to Linus' tree): 1675 1912 files changed, 88248 insertions(+), 26064 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 335 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 (3ca706c189db drm/ttm: fix type mismatch error on sparc64) Merging fixes/fixes (3ca706c189db drm/ttm: fix type mismatch error on sparc64) Merging kbuild-current/fixes (926de8c4326c Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging arc-current/for-curr (6880fa6c5660 Linux 5.15-rc1) 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 (3f1c260ffddb MAINTAINERS: Add myself as MStar/Sigmastar Armv7 SoC maintainers) Merging drivers-memory-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging m68k-current/for-linus (a7b68ed15d1f m68k: mvme: Remove overdue #warnings in RTC handling) Merging powerpc-fixes/fixes (787c70f2f999 powerpc/64s: Fix scv implicit soft-mask table for relocated kernels) Merging s390-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) 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 (d198b2776264 Revert "Revert "ipv4: fix memory leaks in ip_cmsg_send() callers"") Merging bpf/master (356ed64991c6 bpf: Handle return value of BPF_PROG_TYPE_STRUCT_OPS prog) Merging ipsec/master (3c10ffddc61f net: xfrm: fix shift-out-of-bounds in xfrm_get_default) Merging netfilter/master (69e73dbfda14 ipvs: check that ip_vs_conn_tab_bits is between 8 and 20) Merging ipvs/master (276aae377206 net: stmmac: fix system hang caused by eee_ctrl_timer during suspend/resume) Merging wireless-drivers/master (e4457a45b41c iwlwifi: fix printk format warnings in uefi.c) Merging mac80211/master (e011912651bd net: ni65: Avoid typecast of pointer to u32) Merging rdma-fixes/for-rc (1b789bd4dbd4 IB/qib: Fix clang confusion of NULL pointer comparison) Merging sound-current/for-linus (ad7cc2d41b7a ALSA: hda/realtek: Quirks to enable speaker output for Lenovo Legion 7i 15IMHG05, Yoga 7i 14ITL5/15ITL5, and 13s Gen2 laptops.) Merging sound-asoc-fixes/for-linus (49660818eb84 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus) Merging regmap-fixes/for-linus (6880fa6c5660 Linux 5.15-rc1) Merging regulator-fixes/for-linus (18844b7517c8 Merge remote-tracking branch 'regulator/for-5.15' into regulator-linus) Merging spi-fixes/for-linus (c6636bc07565 Merge remote-tracking branch 'spi/for-5.15' into spi-linus) Merging pci-current/for-linus (6880fa6c5660 Linux 5.15-rc1) Merging driver-core.current/driver-core-linus (6880fa6c5660 Linux 5.15-rc1) Merging tty.current/tty-linus (7049d853cfb9 tty: unexport tty_ldisc_release) Merging usb.current/usb-linus (da546d6b748e arm64: dts: qcom: ipq8074: remove USB tx-fifo-resize property) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (7bb057134d60 USB: serial: option: add Telit LN920 compositions) Merging usb-chipidea-fixes/for-usb-fixes (98a1373a2de9 usb: cdns3: fix race condition before setting doorbell) Merging phy/fixes (6880fa6c5660 Linux 5.15-rc1) Merging staging.current/staging-linus (92dc0b1f46e1 staging: greybus: uart: fix tty use after free) Merging iio-fixes/fixes-togreg (1a913270e57a iio: adc: ad7793: Fix IRQ flag) Merging char-misc.current/char-misc-linus (25a143321648 mcb: fix error handling in mcb_alloc_bus()) Merging soundwire-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging thunderbolt-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging input-current/for-linus (0c5483a5778f Input: analog - always use ktime functions) 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 (6880fa6c5660 Linux 5.15-rc1) Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) Merging dmaengine-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (f60f5741002b mtd: rawnand: qcom: Update code word value for raw read) 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 (6880fa6c5660 Linux 5.15-rc1) Merging at91-fixes/at91-fixes (4348cc10da63 ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default) 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 (23c69b90365c 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 (3c3c8e88c871 platform/x86: amd-pmc: Increase the response register timeout) Merging samsung-krzk-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging pinctrl-samsung-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging devicetree-fixes/dt/linus (094b147c7662 spi: dt-bindings: xilinx: Drop type reference on *-bits properties) Merging scsi-fixes/fixes (1a0db7744e45 scsi: bsg: Fix device unregistration) Merging drm-fixes/drm-fixes (6880fa6c5660 Linux 5.15-rc1) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (7889367d7795 drm/i915: Enable -Wsometimes-uninitialized) 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 (dfb5c1e12c28 x86/hyperv: remove on-stack cpumask from hv_send_ipi_mask_allbutself) 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 (6880fa6c5660 Linux 5.15-rc1) Merging gpio-brgl-fixes/gpio/for-current (6880fa6c5660 Linux 5.15-rc1) Merging gpio-intel-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) Merging pinctrl-intel-fixes/fixes (6880fa6c5660 Linux 5.15-rc1) 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 (6880fa6c5660 Linux 5.15-rc1) 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 (4209f03fcb8e drm/vc4: hdmi: Warn if we access the controller while disabled) Merging kspp-gustavo/for-next/kspp (926ade1092a3 Merge branch 'for-next/clang-fallthrough' into for-next/kspp) Merging kbuild/for-next (860091ee86e6 riscv: move the (z)install rules to arch/riscv/Makefile) Merging compiler-attributes/compiler-attributes (b83a908498d6 compiler_attributes.h: move __compiletime_{error|warning}) Merging dma-mapping/for-next (59583f747664 sparc32: page align size in arch_dma_alloc) Merging asm-generic/master (7962c2eddbfe arch: remove unused function syscall_set_arguments()) Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1) Merging arm/for-next (1c9b5911f53b Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (85f58eb18898 arm64: kdump: Skip kmemleak scan reserved memory for kdump) Merging arm-perf/for-next/perf (fd264b310579 arm64/perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF) Merging arm-soc/for-next (6880fa6c5660 Linux 5.15-rc1) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (faae6a457101 Merge branches 'v5.16/dt64' and 'v5.16/drivers' 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 (9648a43994eb Merge branch 'at91-fixes' into at91-next) Merging drivers-memory/for-next (6880fa6c5660 Linux 5.15-rc1) 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 (cbbd8f16ae1c Merge branches 'renesas-arm-dt-for-v5.16', 'renesas-drivers-for-v5.16' and 'renesas-dt-bindings-for-v5.16' 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 (6880fa6c5660 Linux 5.15-rc1) Merging scmi/for-linux-next (b1d6695c249e 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 (bb289f4c0b2b Merge branches 'sunxi/clk-for-5.16', 'sunxi/core-for-5.16', 'sunxi/drivers-for-5.16', 'sunxi/dt-for-5.16' and 'sunxi/fixes-for-5.15' 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 (500e6dfbb465 arm64: dts: ti: k3-am64-mcu: Add pinctrl) Merging xilinx/for-next (4d7e3c8de98e Merge branch 'zynqmp/dt' of https://github.com/Xilinx/linux-xlnx into for-next) Merging clk/clk-next (6880fa6c5660 Linux 5.15-rc1) Merging clk-imx/for-next (86842d255b45 clk: imx8mn: Add M7 core clock) Merging clk-renesas/renesas-clk (8ac4aedcf7b3 clk: renesas: r8a779a0: Add TPU clock) Merging clk-samsung/for-next (1d26eaeec37a clk: samsung: s5pv210-audss: Make use of devm_platform_ioremap_resource()) 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 (a7b68ed15d1f m68k: mvme: Remove overdue #warnings in RTC handling) Merging m68knommu/for-next (6880fa6c5660 Linux 5.15-rc1) Merging microblaze/next (315511166469 microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild) Merging mips/mips-next (6880fa6c5660 Linux 5.15-rc1) Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory()) CONFLICT (content): Merge conflict in arch/nds32/Kconfig 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 (1530bf2852cc Define and export PAGE0 in vmlinux.lds.S linker script) 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 (6f55ab36bef5 riscv: Move EXCEPTION_TABLE to RO_DATA segment) Merging s390/for-next (6880fa6c5660 Linux 5.15-rc1) 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 (234640275675 um: rename set_signals() to um_set_signals()) 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 (e51480e6f4f8 Merge branch 'for-next-next-v5.15-20210913' into for-next-20210913) Merging ceph/master (4b0b8836ebba ceph: fix off by one bugs in unsafe_request_wait()) Merging cifs/for-next (c1abf1305957 cifs: rename uapi/linux/cifs directory to uapi/linux/smbfs_client) Merging cifsd/cifsd-for-next (bf9f243f23e6 Merge tag '5.15-rc-ksmbd-part2' of git://git.samba.org/ksmbd) 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 (948ca5f30e1d ext4: enforce buffer head state assertion in ext4_da_map_blocks) 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 (7a41554fdfb0 fuse: move fuse_invalidate_attr() into fuse_update_ctime()) 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 (6880fa6c5660 Linux 5.15-rc1) 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 (8e69212253d3 fs/ntfs3: Always use binary search with entry search) 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 (90f7d7a0d0d6 locks: remove LOCK_MAND flock lock support) Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next) Merging printk/for-next (9980c4251f8d printk: use kvmalloc instead of kmalloc for devkmsg_user) Merging pci/next (6880fa6c5660 Linux 5.15-rc1) 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 (294b29f15469 i2c: xiic: Fix RX IRQ busy check) Merging i3c/i3c/next (41a0430dd5ca i3c/master/mipi-i3c-hci: Prefer kcalloc over open coded arithmetic) Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias) Merging hwmon-staging/hwmon-next (f2a787937ec9 hwmon: (raspberrypi) Use generic notification mechanism) Merging jc_docs/docs-next (242f4c77b1c8 docs: zh_TW/index: Move arm64/index to arch-specific section) 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 (6880fa6c5660 Linux 5.15-rc1) Merging cpufreq-arm/cpufreq/arm/linux-next (4855e26bcf4d cpufreq: mediatek-hw: Add support for CPUFREQ HW) Merging cpupower/cpupower (79a0dc5530a9 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 (fc26023f8816 thermal/drivers/int340x: Fix tcc offset on resume) 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 (1b789bd4dbd4 IB/qib: Fix clang confusion of NULL pointer comparison) Merging net-next/master (f2173257b92e Merge branch 'hns3-mac') Merging bpf-next/for-next (67dfac47dac6 Merge branch 'libbpf: Streamline internal BPF program sections handling') $ git reset --hard HEAD^ Merging next-20210913 version of bpf-next 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 (6880fa6c5660 Linux 5.15-rc1) Merging netfilter-next/master (13bb8429ca98 net: wwan: iosm: firmware flashing and coredump collection) Merging ipvs-next/master (9e9fb7655ed5 Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging wireless-drivers-next/master (6880fa6c5660 Linux 5.15-rc1) Merging bluetooth/master (81be03e026dc Bluetooth: RFCOMM: Replace use of memcpy_from_msg with bt_skb_sendmmsg) Merging mac80211-next/master (626bf91a292e Merge tag 'net-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging mtd/mtd/next (b72841e4dcd5 mtd: mtdswap: Remove redundant assignment of pointer eb) Merging nand/nand/next (46a0dc10fb32 mtd: rawnand: intel: Fix potential buffer overflow in 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 (6880fa6c5660 Linux 5.15-rc1) Merging drm-misc/for-linux-next (70982eef4d7e drm/ttm: Fix a deadlock if the target BO is not idle during swap) Merging amdgpu/drm-next (4e055c674bd3 drm/ttm: fix the type mismatch error on sparc64) Merging drm-intel/for-linux-next (5f0d4214938d drm/i915/dg1: Add new PCI id) 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 (6880fa6c5660 Linux 5.15-rc1) Merging sound/for-next (ad7cc2d41b7a ALSA: hda/realtek: Quirks to enable speaker output for Lenovo Legion 7i 15IMHG05, Yoga 7i 14ITL5/15ITL5, and 13s Gen2 laptops.) Merging sound-asoc/for-next (8897c6ccc423 Merge remote-tracking branch 'asoc/for-5.16' into asoc-next) Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer) Merging input/next (e2afe95a87a2 dt-bindings: input: Add binding for cypress-sf) Merging block/for-next (291470332387 Merge branch 'iov_iter' into for-next) Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq()) Merging libata/for-next (6880fa6c5660 Linux 5.15-rc1) Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug) Merging mmc/next (4ed8431c42ba Merge branch 'fixes' into next) 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 (fa108e34d765 Merge remote-tracking branch 'regulator/for-5.16' into regulator-next) 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 (836f7b6ca082 ima: fix deadlock when traversing "ima_default_rules".) 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 (6880fa6c5660 Linux 5.15-rc1) 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 (b58886bf14da Merge branch 'iommu/fixes' into next) Merging audit/next (d680c6b49c5e audit: Convert to SPDX identifier) Merging devicetree/for-next (53182e81f47d kbuild: Enable DT schema checks for %.dtb targets) Merging mailbox/mailbox-for-next (85dfdbfc13ea mailbox: cmdq: add multi-gce clocks support for mt8195) Merging spi/for-next (69dde9e5a835 Merge remote-tracking branch 'spi/for-5.16' into spi-next) Merging tip/auto-latest (019a926fcae5 Merge branch 'perf/core') 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 (8e9f0934a07e bootconfig: Free copied bootconfig data after boot) CONFLICT (content): Merge conflict in lib/bootconfig.c Merging rcu/rcu/next (337b129c01e1 clocksource: Forgive repeated long-latency watchdog clocksource reads) 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 (0a3b748e7c71 swiotlb-xen: drop DEFAULT_NSLABS) $ git reset --hard HEAD^ Merging next-20210914 version of xen-tip Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next) Merging workqueues/for-next (6880fa6c5660 Linux 5.15-rc1) Merging drivers-x86/for-next (1f88e0a22f7c platform/x86: acer-wmi: use __packed instead of __attribute__((packed))) 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 (6880fa6c5660 Linux 5.15-rc1) Merging ipmi/for-next (6880fa6c5660 Linux 5.15-rc1) Merging driver-core/driver-core-next (6880fa6c5660 Linux 5.15-rc1) Merging usb/usb-next (6880fa6c5660 Linux 5.15-rc1) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (6880fa6c5660 Linux 5.15-rc1) Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed) Merging tty/tty-next (6880fa6c5660 Linux 5.15-rc1) Merging char-misc/char-misc-next (6880fa6c5660 Linux 5.15-rc1) Merging extcon/extcon-next (a864e1bf1fbb extcon: max3355: Drop unused include) Merging phy-next/next (6880fa6c5660 Linux 5.15-rc1) Merging soundwire/next (6880fa6c5660 Linux 5.15-rc1) Merging thunderbolt/next (6880fa6c5660 Linux 5.15-rc1) 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 (8757f705d936 staging: vchiq_dev: cleanup code alignment issues) 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 (6880fa6c5660 Linux 5.15-rc1) Merging cgroup/for-next (c0002d11d799 cgroupv2, docs: fix misinformation in "device controller" section) Merging scsi/for-next (1a0db7744e45 scsi: bsg: Fix device unregistration) Merging scsi-mkp/for-next (e018f03d6ccb scsi: libiscsi: Move ehwait initialization to iscsi_session_setup()) Merging vhost/linux-next (be9c6bad9b46 vdpa: potential uninitialized return in vhost_vdpa_va_map()) Merging rpmsg/for-next (99fdaca991f7 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 (3ea046564039 dt-bindings: gpio: add gpio-line-names to rockchip,gpio-bank.yaml) Merging gpio-intel/for-next (6880fa6c5660 Linux 5.15-rc1) 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 (6880fa6c5660 Linux 5.15-rc1) Merging pinctrl-renesas/renesas-pinctrl (075667cc6c29 pinctrl: renesas: No need to initialise global statics) Merging pinctrl-samsung/for-next (6880fa6c5660 Linux 5.15-rc1) 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 (6880fa6c5660 Linux 5.15-rc1) 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 (6880fa6c5660 Linux 5.15-rc1) Merging nvdimm/libnvdimm-for-next (bdd3c50d83bf dax: remove bdev_dax_supported) Merging at24/at24/for-next (762925405482 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 (0c2406ffcdfe Merge branch 'for-next/overflow' into for-next/kspp) CONFLICT (content): Merge conflict in include/linux/compiler_types.h CONFLICT (content): Merge conflict in include/linux/compiler-gcc.h CONFLICT (modify/delete): drivers/staging/rtl8188eu/include/ieee80211.h deleted in HEAD and modified in kspp/for-next/kspp. Version kspp/for-next/kspp of drivers/staging/rtl8188eu/include/ieee80211.h left in tree. $ git rm -f drivers/staging/rtl8188eu/include/ieee80211.h 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 (6880fa6c5660 Linux 5.15-rc1) Merging nvmem/for-next (536267aafb8a 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 (6880fa6c5660 Linux 5.15-rc1) Merging fpga/for-next (4f45f3404960 spi: spi-altera-dfl: support n5010 feature revision) Merging kunit/test (6880fa6c5660 Linux 5.15-rc1) Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3) Merging kunit-next/kunit (6880fa6c5660 Linux 5.15-rc1) 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 (1ee31a7d5844 hfsplus: fix out-of-bounds warnings in __hfsplus_setxattr) $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (1de928b1c19b mm/vmalloc: add __alloc_size attributes for better bounds checking)
Attachment:
pgp24rvAfJf0U.pgp
Description: OpenPGP digital signature
