Hi all, Changes since 20210215: The net-next tree gained conflicts against the arm-soc tree. The mtd tree lost its build failure. The gpio-brgl tree gained conflicts against the arm-soc and net-next trees. Non-merge commits (relative to Linus' tree): 10480 10579 files changed, 459872 insertions(+), 292794 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 333 trees (counting Linus' and 87 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 (f40ddce88593 Linux 5.11) Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) Merging kbuild-current/fixes (fe968c41ac4f scripts: set proper OpenSSL include dir also for sign-file) Merging arc-current/for-curr (7c53f6b671f4 Linux 5.11-rc3) Merging arm-current/fixes (4d62e81b60d4 ARM: kexec: fix oops after TLB are invalidated) Merging arm64-fixes/for-next/fixes (68d54ceeec0e arm64: mte: Allow PTRACE_PEEKMTETAGS access to the zero page) Merging arm-soc-fixes/arm/fixes (090e502e4e63 Merge tag 'socfpga_dts_fix_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/fixes) Merging drivers-memory-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging m68k-current/for-linus (c396dd2ec5bb macintosh/adb-iop: Use big-endian autopoll mask) Merging powerpc-fixes/fixes (8c511eff1827 powerpc/kuap: Allow kernel thread to access userspace after kthread_use_mm) Merging s390-fixes/fixes (92bf22614b21 Linux 5.11-rc7) Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (62e69bc41977 net: wan/lmc: unregister device when no matching device is found) Merging bpf/master (57baf8cc70ea net: axienet: Handle deferred probe on clock properly) Merging ipsec/master (57baf8cc70ea net: axienet: Handle deferred probe on clock properly) Merging netfilter/master (57baf8cc70ea net: axienet: Handle deferred probe on clock properly) Merging ipvs/master (44a674d6f798 Merge tag 'mlx5-fixes-2021-01-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) Merging wireless-drivers/master (93a1d4791c10 mt76: dma: fix a possible memory leak in mt76_add_fragment()) Merging mac80211/master (57baf8cc70ea net: axienet: Handle deferred probe on clock properly) Merging rdma-fixes/for-rc (1048ba83fb1c Linux 5.11-rc6) Merging sound-current/for-linus (c3bb2b521944 ALSA: hda/realtek: Quirk for HP Spectre x360 14 amp setup) Merging sound-asoc-fixes/for-linus (919fb44b0840 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) Merging regmap-fixes/for-linus (19c329f68089 Linux 5.11-rc4) Merging regulator-fixes/for-linus (8571bdc21388 Merge remote-tracking branch 'regulator/for-5.11' into regulator-linus) Merging spi-fixes/for-linus (110bc220aaab Merge remote-tracking branch 'spi/for-5.11' into spi-linus) Merging pci-current/for-linus (7e69d07d7c3c Revert "PCI/ASPM: Save/restore L1SS Capability for suspend/resume") Merging driver-core.current/driver-core-linus (6ee1d745b7c9 Linux 5.11-rc5) Merging tty.current/tty-linus (6ee1d745b7c9 Linux 5.11-rc5) Merging usb.current/usb-linus (92bf22614b21 Linux 5.11-rc7) Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) Merging usb-serial-fixes/usb-linus (92bf22614b21 Linux 5.11-rc7) Merging usb-chipidea-fixes/for-usb-fixes (491b1bea0004 MAINTAINERS: update Peter Chen's email address) Merging phy/fixes (9a8b9434c60f phy: mediatek: Add missing MODULE_DEVICE_TABLE()) Merging staging.current/staging-linus (6ee1d745b7c9 Linux 5.11-rc5) Merging char-misc.current/char-misc-linus (6ee1d745b7c9 Linux 5.11-rc5) Merging soundwire-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging thunderbolt-fixes/fixes (f40ddce88593 Linux 5.11) Merging input-current/for-linus (9bbd77d5bbc9 Input: xpad - sync supported devices with fork on GitHub) Merging crypto-current/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API) Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) Merging vfio-fixes/for-linus (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV) Merging kselftest-fixes/fixes (7a6eb7c34a78 selftests: Skip BPF seftests by default) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging dmaengine-fixes/fixes (b6c14d7a8380 dmaengine dw: Revert "dmaengine: dw: Enable runtime PM") Merging backlight-fixes/for-backlight-fixes (5c8fe583cce5 Linux 5.11-rc1) Merging mtd-fixes/mtd/fixes (b135b3358d73 mtd: rawnand: omap: Use BCH private fields in the specific OOB layout) Merging mfd-fixes/for-mfd-fixes (5c8fe583cce5 Linux 5.11-rc1) Merging v4l-dvb-fixes/fixes (ef357e02b6c4 media: rockchip: rkisp1: extend uapi array sizes) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (7b490a8ab0f2 MIPS: OCTEON: fix unreachable code in octeon_irq_init_ciu) Merging at91-fixes/at91-fixes (5c8fe583cce5 Linux 5.11-rc1) Merging omap-fixes/fixes (9bbce32a20d6 ARM: dts: am33xx: add aliases for mmc interfaces) Merging kvm-fixes/master (031b91a5fe6f KVM: x86: Set so called 'reserved CR3 bits in LM mask' at vCPU reset) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) Merging hwmon-fixes/hwmon (4008bc7d3953 hwmon: (dell-smm) Add XPS 15 L502X to fan control blacklist) Merging nvdimm-fixes/libnvdimm-fixes (7018c897c2f2 libnvdimm/dimm: Avoid race between probe and available_slots_show()) Merging btrfs-fixes/next-fixes (7575423616f6 Merge branch 'misc-5.11' into next-fixes) Merging vfs-fixes/fixes (d36a1dd9f77a dump_common_audit_data(): fix racy accesses to ->d_name) Merging dma-mapping-fixes/for-linus (d17405d52bac dma-mapping: benchmark: fix kernel crash when dma_map_single fails) Merging i3c-fixes/i3c/fixes (291b5c9870fc i3c/master/mipi-i3c-hci: Fix position of __maybe_unused in i3c_hci_of_match) Merging drivers-x86-fixes/fixes (215164bfb714 platform/x86: dell-wmi-sysman: fix a NULL pointer dereference) Merging samsung-krzk-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging pinctrl-samsung-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging devicetree-fixes/dt/linus (32ada6b0980d dt-bindings: Cleanup standard unit properties) Merging scsi-fixes/fixes (f852c596f2ee scsi: scsi_debug: Fix a memory leak) Merging drm-fixes/drm-fixes (f40ddce88593 Linux 5.11) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (f40ddce88593 Linux 5.11) Merging mmc-fixes/fixes (d7fb9c242095 mmc: sdhci-pltfm: Fix linking err for sdhci-brcmstb) Merging rtc-fixes/rtc-fixes (5c8fe583cce5 Linux 5.11-rc1) Merging gnss-fixes/gnss-linus (7c53f6b671f4 Linux 5.11-rc3) Merging hyperv-fixes/hyperv-fixes (fff7b5e6ee63 x86/hyperv: Initialize clockevents after LAPIC is initialized) Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) Merging risc-v-fixes/fixes (3da3cc1b5f47 Revert "dts: phy: add GPIO number and active state used for phy reset") Merging pidfd-fixes/fixes (a409ed156a90 Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fpga-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging spdx/spdx-linus (6ee1d745b7c9 Linux 5.11-rc5) Merging gpio-brgl-fixes/gpio/for-current (f40ddce88593 Linux 5.11) Merging gpio-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging pinctrl-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (2b8fdbbf1c61 kunit: tool: move kunitconfig parsing into __init__, make it optional) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) Merging memblock-fixes/fixes (17cbe03872be mm/memblock: Fix typo in comment of memblock_phys_alloc_try_nid()) Merging cel-fixes/for-rc (0ac24c320c4d svcrdma: Hold private mutex while invoking rdma_accept()) Merging drm-misc-fixes/for-linux-next-fixes (811ee9dff580 drm/ttm: make sure pool pages are cleared) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) Merging kbuild/for-next (49362029a00b kbuild: LD_VERSION redenomination) Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc4) Merging dma-mapping/for-next (3dc47131f8aa media: uvcvideo: Use dma_alloc_noncontiguos API) Merging asm-generic/master (38489db09b10 Merge branch 'asm-generic-fixes' into asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (171db91076f3 Merge branch 'devel-stable' into for-next) Merging arm64/for-next/core (1ffa9763828c Merge branch 'for-next/vdso' into for-next/core) Merging arm-perf/for-next/perf (f0c140481d1b perf: Constify static struct attribute_group) Merging arm-soc/for-next (e6c44b8c57c9 soc: document merges) CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug Merging actions/for-next (006828d706fd Merge branch 'v5.12/defconfig' into for-next) Merging amlogic/for-next (70994f761efe Merge branch 'v5.12/soc' into tmp/aml-rebuild) Merging aspeed/for-next (697dabd5d370 Merge branches 'soc-for-v5.12' and 'dt-for-v5.12' into for-next) Merging at91/at91-next (aae49663c4b4 Merge branch 'at91-defconfig' into at91-next) Merging drivers-memory/for-next (5c289c7fae29 Merge branch 'mem-ctrl-next' into for-next) Merging imx-mxs/for-next (7535d59c5f11 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) Merging mediatek/for-next (e6468af3b590 Merge branch 'v5.11-next/soc' into for-next) Merging mvebu/for-next (8e03d45cb7de Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (01e73147cbf8 Merge branch 'fixes' into for-next) Merging qcom/for-next (d79b47c59576 Merge branches 'arm64-defconfig-for-5.12', 'arm64-for-5.12', 'defconfig-for-5.12', 'drivers-for-5.12' and 'dts-for-5.12' into for-next) Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller) Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (fc6f32116126 Merge branches 'renesas-arm-dt-for-v5.12' and 'renesas-drivers-for-v5.12' into renesas-next) Merging reset/reset/next (d17655759b3f reset: Add devm_reset_control_get_optional_exclusive_released()) Merging rockchip/for-next (38051549ac38 Merge branch 'v5.12-clk/next' into for-next) Merging samsung-krzk/for-next (da2f247fcbf4 Merge branch 'next/soc' into for-next) Merging scmi/for-linux-next (61556703b610 Merge tag 'for-linus-5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml) Merging stm32/stm32-next (a9c92a9671d7 ARM: dts: stm32: add #clock-cells property to usbphyc node on stm32mp151) Merging sunxi/sunxi/for-next (a352e9e72aa3 Merge branch 'sunxi/dt-for-5.12-late' into sunxi/for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-r16-parrot.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-a33-olinuxino.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31s-primo81.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-m9.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun6i-a31-hummingbird.dts Merging tegra/for-next (b62f4a3fbb22 Merge branch for-5.12/arm64/defconfig 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 (e37eac10bb5d Merge branch 'ti-k3-dts-next' into ti-k3-next) Merging clk/clk-next (2cb843dbcd69 Merge branch 'clk-qcom' into clk-next) Merging clk-renesas/renesas-clk (24ece96554a9 clk: renesas: cpg-mssr: Fix formatting issues for 'smstpcr_saved's documentation) Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) Merging csky/linux-next (9d986b01feb9 csky: use free_initmem_default() in free_initmem()) Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) Merging m68k/for-next (c396dd2ec5bb macintosh/adb-iop: Use big-endian autopoll mask) Merging m68knommu/for-next (c1fb1bf64bb6 m68k: let clk_enable() return immediately if clk is NULL) Merging microblaze/next (b68c8736a01f microblaze: Remove support for gcc < 4) Merging mips/mips-next (e6ce4a480c76 MIPS: kernel: Drop kgdb_call_nmi_hook) CONFLICT (content): Merge conflict in .mailmap Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) Merging openrisc/for-next (8f722f67452f openrisc: Use devicetree to determine present cpus) Merging parisc-hd/for-next (2347961b11d4 binfmt_misc: pass binfmt_misc flags to the interpreter) Merging powerpc/next (82d2c16b350f powerpc/perf: Adds support for programming of Thresholding in P10) Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) Merging risc-v/for-next (36c3d86ac4e7 arch_numa: fix common code printing of phys_addr_t) CONFLICT (content): Merge conflict in drivers/soc/Makefile CONFLICT (content): Merge conflict in drivers/soc/Kconfig CONFLICT (content): Merge conflict in arch/arm64/mm/Makefile Merging s390/for-next (b47f625e102b Merge branch 'features' into for-next) Merging sh/for-next (b89bc060b53e sh/intc: Restore devm_ioremap() alignment) 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 (ddad5187fc2a um: irq.h: include <asm-generic/irq.h>) Merging xtensa/xtensa-for-next (7b79eba1d0d1 xtensa: fix spelling mistake in Kconfig "wont" -> "won't") Merging pidfd/for-next (f69e8091c4a2 xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl) CONFLICT (content): Merge conflict in fs/overlayfs/inode.c CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c CONFLICT (content): Merge conflict in fs/ecryptfs/inode.c Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) Merging fscache/fscache-next (32685453751f netfs: Hold a ref on a page when PG_private_2 is set) CONFLICT (content): Merge conflict in include/linux/fs.h Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) Merging btrfs/for-next (a4d0c0832d98 Merge branch 'for-next-next-v5.11-20210211' into for-next-20210211) CONFLICT (content): Merge conflict in lib/iov_iter.c Merging ceph/master (9d5ae6f3c50a libceph: fix "Boolean result is used in bitwise operation" warning) Merging cifs/for-next (f40ddce88593 Linux 5.11) Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) Merging ecryptfs/next (902af369942f ecryptfs: use DEFINE_MUTEX() for mutex lock) Merging erofs/dev (ce0631291813 erofs: initialized fields can only be observed after bit is set) Merging exfat/dev (61dd9f0b09e0 exfat: improve performance of exfat_free_cluster when using dirsync mount option) Merging ext3/for_next (c5b8ccc3da76 Pull udf & isofs UID/GID parsing fixes.) Merging ext4/dev (b5776e7524af ext4: fix potential htree index checksum corruption) Merging f2fs/dev (938a184265d7 f2fs: give a warning only for readonly partition) CONFLICT (content): Merge conflict in fs/f2fs/file.c CONFLICT (content): Merge conflict in fs/f2fs/acl.c Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (5d069dbe8aaf fuse: fix bad inode) Merging jfs/jfs-next (4208c398aae4 fs/jfs: fix potential integer overflow on shift of a int) Merging nfs/linux-next (92bf22614b21 Linux 5.11-rc7) Merging nfs-anna/linux-next (848fdd62399c NFS: Don't set NFS_INO_INVALID_XATTR if there is no xattr cache) Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) Merging cel/for-next (428a23d2bf0c nfsd: skip some unnecessary stats in the v4 case) Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) Merging overlayfs/overlayfs-next (d46b7cd68336 ovl: plumb through flush method) Merging ubifs/next (42119dbe571e ubifs: Fix error return code in alloc_wbufs()) Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation) Merging xfs/for-next (1cd738b13ae9 xfs: consider shutdown in bmapbt cursor delete assert) CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c Merging zonefs/for-next (6716b125b339 zonefs: add tracepoints for file operations) Merging iomap/iomap-for-next (ed1128c2d0c8 xfs: reduce exclusive locking on unaligned dio) Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) Merging file-locks/locks-next (cc4a3f885e8f fcntl: make F_GETOWN(EX) return 0 on dead owner task) Merging vfs/for-next (07add5008f9f Merge branch 'work.namei' into for-next) CONFLICT (content): Merge conflict in fs/namei.c CONFLICT (content): Merge conflict in fs/coredump.c CONFLICT (content): Merge conflict in arch/Kconfig Merging printk/for-next (f78dd21aa363 Merge branch 'for-5.12-no_hash_pointers' into for-next) Merging pci/next (49a938fdc928 Merge branch 'remotes/lorenzo/pci/misc') Merging pstore/for-next/pstore (26fecbf7602d pstore: Move kmsg_bytes default into Kconfig) Merging hid/for-next (5b5ca5d1a53c Merge branch 'for-5.12/playstation' into for-next) CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig Merging i2c/i2c/for-next (35ea257a39ae Merge branch 'i2c/for-5.12' into i2c/for-next) Merging i3c/i3c/next (5c34b8e7e8bb i3c: master: dw: Drop redundant disec call) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (6ab3332cc692 MAINTAINERS: Add entry for Texas Instruments TPS23861 PoE PSE) Merging jc_docs/docs-next (3c2e0a489da6 docs: kernel-hacking: be more civil) Merging v4l-dvb/master (8f202f8e9ff3 media: v4l: async: Fix kerneldoc documentation for async functions) Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include) CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c CONFLICT (content): Merge conflict in Documentation/dev-tools/kasan.rst Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (5352de4c92b3 Merge branch 'acpi-properties' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (7114ebffd330 cpufreq: remove tango driver) Merging cpupower/cpupower (3a3ecfdb605c cpupower: Add cpuid cap flag for MSR_AMD_HWCR support) Merging devfreq/devfreq-next (fc1745c0e40c PM / devfreq: rk3399_dmc: Remove unneeded semicolon) Merging opp/opp/linux-next (86ad9a24f21e PM / devfreq: Add required OPPs support to passive governor) Merging thermal/thermal/linux-next (ca66dca5eda6 thermal: qcom: add support for adc-tm5 PMIC thermal monitor) Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') Merging dlm/next (4f19d071f9be fs: dlm: check on existing node address) Merging swiotlb/linux-next (e998879d4fb7 x86,swiotlb: Adjust SWIOTLB bounce buffer size for SEV guests) Merging rdma/for-next (a14e3caaaa72 RDMA/qedr: Remove in_irq() usage from debug output) CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_net.c Merging net-next/master (9ec5eea5b6ac lib/parman: Delete newline) CONFLICT (content): Merge conflict in tools/testing/selftests/net/forwarding/tc_flower.sh CONFLICT (content): Merge conflict in include/uapi/linux/pkt_cls.h CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_rx.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_main.c CONFLICT (content): Merge conflict in arch/arm64/boot/dts/toshiba/tmpv7708.dtsi CONFLICT (content): Merge conflict in arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts Merging bpf-next/for-next (45159b27637b bpf: Clear subreg_def for global function return values) CONFLICT (content): Merge conflict in net/ipv4/tcp.c Merging ipsec-next/master (c48f86071027 Merge branch 'PTP-for-DSA-tag_ocelot_8021q') Merging mlx5-next/mlx5-next (ab0da5a57188 net/mlx5: Expose ifc bits for query modify header) Merging netfilter-next/master (c4762993129f Merge branch 'skbuff-introduce-skbuff_heads-bulking-and-reusing') Merging ipvs-next/master (a61e4b60761f Merge branch 'net-dsa-hellcreek-add-taprio-offloading') Merging wireless-drivers-next/master (773dc50d7169 Merge branch 'Xilinx-axienet-updates') Merging bluetooth/master (55c0bd77479b Bluetooth: hci_qca: Fixed issue during suspend) Merging mac80211-next/master (c4762993129f Merge branch 'skbuff-introduce-skbuff_heads-bulking-and-reusing') Merging gfs2/for-next (7009fa9cd9a5 gfs2: Recursive gfs2_quota_hold in gfs2_iomap_end) Merging mtd/mtd/next (6e9dff6fe3fb dt-bindings: mtd: add binding for BCM4908 partitions) Merging nand/nand/next (073abfa7ea9a mtd: rawnand: intel: Fix an error handling path in 'ebu_dma_start()') Merging spi-nor/spi-nor/next (75386810d3a6 mtd: spi-nor: sst: Add support for Global Unlock on sst26vf) Merging crypto/master (0de9dc80625b hwrng: timeriomem - Use device-managed registration API) Merging drm/drm-next (ac35d19fe871 Merge branch '00.00-inst' of git://github.com/skeggsb/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_breadcrumbs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/gen7_renderclear.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h Merging drm-misc/for-linux-next (e2183fb135a7 Revert "drm/scheduler: Job timeout handler returns status (v3)") CONFLICT (modify/delete): drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c deleted in drm-misc/for-linux-next and modified in HEAD. Version HEAD of drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c left in tree. CONFLICT (modify/delete): drivers/gpu/drm/gma500/mdfld_output.c deleted in drm-misc/for-linux-next and modified in HEAD. Version HEAD of drivers/gpu/drm/gma500/mdfld_output.c left in tree. CONFLICT (modify/delete): drivers/gpu/drm/gma500/mdfld_dsi_output.c deleted in drm-misc/for-linux-next and modified in HEAD. Version HEAD of drivers/gpu/drm/gma500/mdfld_dsi_output.c left in tree. CONFLICT (modify/delete): drivers/gpu/drm/gma500/mdfld_device.c deleted in drm-misc/for-linux-next and modified in HEAD. Version HEAD of drivers/gpu/drm/gma500/mdfld_device.c left in tree. CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/Kconfig $ git rm -f drivers/gpu/drm/gma500/mdfld_device.c drivers/gpu/drm/gma500/mdfld_dsi_output.c drivers/gpu/drm/gma500/mdfld_output.c drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c Merging amdgpu/drm-next (5c86a4a21df3 drm/amdgpu/display: handle aux backlight in backlight_get_brightness) Merging drm-intel/for-linux-next (7a6c6243b44a drm/i915: Reject 446-480MHz HDMI clock on GLK) Merging drm-tegra/drm/tegra/for-next (dcdfe2712b68 drm/tegra: Fix reference leak when pm_runtime_get_sync() fails) Merging drm-msm/msm-next (182b4a2d2513 drm/msm/dp: Add a missing semi-colon) Merging imx-drm/imx-drm/next (82581fcf070b drm/modes: add non-OF stub for of_get_drm_display_mode) Merging etnaviv/etnaviv/next (7d614ab2f205 drm/etnaviv: fix NULL check before some freeing functions is not needed) Merging regmap/for-next (aa3233086b48 Merge remote-tracking branch 'regmap/for-5.12' into regmap-next) Merging sound/for-next (c3bb2b521944 ALSA: hda/realtek: Quirk for HP Spectre x360 14 amp setup) Merging sound-asoc/for-next (919fb44b0840 Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus) Merging modules/modules-next (1e80d9cb579e module: potential uninitialized return in module_kallsyms_on_each_symbol()) Merging input/next (7a6a53b2b1a3 Input: iqs5xx - initialize an uninitialized variable) Merging block/for-next (9f40d53a08d3 Merge branch 'for-5.12/io_uring' into for-next) CONFLICT (content): Merge conflict in lib/iov_iter.c CONFLICT (content): Merge conflict in fs/iomap/direct-io.c CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst Applying: block: bio: fix up for bi_disk removal Applying: block: btrfs: another fix up for bi_disk removal Merging device-mapper/for-next (a666e5c05e7c dm: fix deadlock when swapping to encrypted device) Merging pcmcia/pcmcia-next (4ce6b242b78d pcmcia: Switch to using the new API kobj_to_dev()) Merging mmc/next (a56f44138a2c mmc: sdhci-esdhc-imx: fix kernel panic when remove module) Merging mfd/for-mfd-next (26783d74cc6a mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq()) Merging backlight/for-backlight-next (4a98e5ef88f8 backlight: sky81452-backlight: Convert comma to semicolon) Merging battery/for-next (a72acc56f3e9 power-supply: use kobj_to_dev()) Merging regulator/for-next (f03e2a72e5e8 Merge remote-tracking branch 'regulator/for-5.12' into regulator-next) Merging security/next-testing (9dcd47fc1f7d Merge branch 'fixes-v5.10' into next-testing) Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) Merging integrity/next-integrity (f6692213b504 integrity: Make function integrity_add_key() static) CONFLICT (content): Merge conflict in security/integrity/ima/ima_policy.c CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c CONFLICT (content): Merge conflict in security/integrity/ima/ima_api.c Merging keys/keys-next (5bcd72358a7d Merge branch 'keys-cve-2020-26541' into keys-next) Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) Merging selinux/next (365982aba1f2 fs: anon_inodes: rephrase to appropriate kernel-doc) Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs write functions) Merging tomoyo/master (9c83465f3245 tomoyo: recognize kernel threads correctly) Merging tpmdd/next (5cb9c551cb13 tpm_tis: Clean up locality release) Merging watchdog/master (a4f3407c4160 watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ) Merging iommu/next (45e606f27269 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging audit/next (127c8c5f0589 audit: Make audit_filter_syscall() return void) Merging devicetree/for-next (cb8be8b4b27f driver core: platform: Drop of_device_node_put() wrapper) CONFLICT (content): Merge conflict in scripts/Makefile.lib CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml Merging mailbox/mailbox-for-next (d1e6bc0ca01c mailbox: tegra-hsp: Set lockdep class dynamically) Merging spi/for-next (eec262d179ff Merge remote-tracking branch 'spi/for-5.12' into spi-next) CONFLICT (content): Merge conflict in drivers/spi/spi-mpc52xx.c Merging tip/auto-latest (f1b61f7b4fb9 Merge branch 'core/mm') Merging clockevents/timers/drivers/next (e85c1d21b16b clocksource/drivers/timer-microchip-pit64b: Add clocksource suspend/resume) Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into edac-for-next) Merging irqchip/irq/irqchip-next (a890caeb2ba4 irqchip/imx: IMX_INTMUX should not default to y, unconditionally) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml Merging ftrace/for-next (e23db805da2d tracing/tools: Add the latency-collector to tools directory) CONFLICT (content): Merge conflict in kernel/trace/trace.c Merging rcu/rcu/next (c8c430f4a2fb Merge branch 'nolibc.2021.01.21a' into HEAD) Merging kvm/next (8c6e67bec319 Merge tag 'kvmarm-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c Merging kvm-arm/next (c93199e93e12 Merge branch 'kvm-arm64/pmu-debug-fixes-5.11' 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 (50a05be484cb KVM: s390: track synchronous pfault events in kvm_stat) Merging xen-tip/linux-next (f40ddce88593 Linux 5.11) Merging percpu/for-next (df1c002198a8 Merge branch 'for-5.12' into for-next) Merging workqueues/for-next (e9ad2eb3d9ae workqueue: Use %s instead of function name) Merging drivers-x86/for-next (a7d53dbbc70a platform/x86: intel_scu_ipc: Increase virtual timeout from 3 to 5 seconds) CONFLICT (content): Merge conflict in drivers/platform/x86/ideapad-laptop.c Merging chrome-platform/for-next (b4b06c977295 platform/chrome: cros_ec_types: Support disconnect events without partners) Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) Merging leds/for-next (d86464527681 leds: gpio: Set max brightness to 1) Merging ipmi/for-next (fc26067c7417 ipmi: remove open coded version of SMBus block write) Merging driver-core/driver-core-next (471b12c43f37 driver core: auxiliary bus: Fix calling stage for auxiliary bus init) Merging usb/usb-next (b5a12546e779 dt-bindings: usb: mediatek: musb: add mt8516 compatbile) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/qcom,dwc3.yaml Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) Merging usb-serial/usb-next (1542d1324be1 USB: serial: drop bogus to_usb_serial_port() checks) Merging usb-chipidea-next/for-usb-next (1ee18ded86ec usb: cdnsp: Removes some useless trace events) Merging tty/tty-next (a157270fbf37 serial: core: Remove BUG_ON(in_interrupt()) check) CONFLICT (content): Merge conflict in include/linux/tty.h Merging char-misc/char-misc-next (d19db80a3665 spmi: spmi-pmic-arb: Fix hw_irq overflow) CONFLICT (content): Merge conflict in scripts/mod/file2alias.c CONFLICT (content): Merge conflict in scripts/mod/devicetable-offsets.c CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h CONFLICT (modify/delete): drivers/tty/n_tracesink.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/tty/n_tracesink.c left in tree. CONFLICT (modify/delete): drivers/tty/n_tracerouter.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/tty/n_tracerouter.c left in tree. $ git rm -f drivers/tty/n_tracerouter.c drivers/tty/n_tracesink.c Merging extcon/extcon-next (bd30a35764e1 extcon: sm5502: Detect OTG when USB_ID is connected to ground) Merging phy-next/next (d68f2cb09597 phy: cpcap-usb: Simplify bool conversion) Merging soundwire/next (8d8d95842867 regmap: sdw-mbq: use MODULE_LICENSE("GPL")) Merging thunderbolt/next (c6da62a219d0 thunderbolt: Add support for native USB4 _OSC) Merging vfio/next (76adb20f924f Merge branch 'v5.12/vfio/next-vaddr' into v5.12/vfio/next) Merging staging/staging-next (4eb839aef182 staging: hikey9xx: Fix alignment of function parameters) 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 (6715ea06ced4 Merge branch 'icc-sdx55' into icc-next) Merging dmaengine/next (eda38ce482b2 dmaengine: dw-axi-dmac: remove redundant null check on desc) Merging cgroup/for-next (00bfa16052cd Merge branch 'for-5.11-fixes' into for-next) Merging scsi/for-next (307e69053eb3 Merge branch 'misc' into for-next) CONFLICT (modify/delete): drivers/scsi/gdth.c deleted in scsi/for-next and modified in HEAD. Version HEAD of drivers/scsi/gdth.c left in tree. $ git rm -f drivers/scsi/gdth.c Merging scsi-mkp/for-next (d39bfd0686fd scsi: iscsi: Drop session lock in iscsi_session_chkready()) Merging vhost/linux-next (bd4ff6766f47 ALSA: virtio: introduce device suspend/resume support) Merging rpmsg/for-next (d9ff3a5789cb 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 (35d9e6959241 gpio: ep93xx: refactor base IRQ number) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts CONFLICT (content): Merge conflict in MAINTAINERS Merging gpio-intel/for-next (c5318e248f52 gpio: msic: Drop driver from Makefile) Merging pinctrl/for-next (b40b760aa2a9 pinctrl: mediatek: Fix trigger type setting follow for unexpected interrupt) Merging pinctrl-intel/for-next (0e793a4e2834 pinctrl: tigerlake: Add Alder Lake-P ACPI ID) Merging pinctrl-renesas/renesas-pinctrl (a5cda861ed57 pinctrl: renesas: r8a779a0: Add TPU pins, groups and functions) Merging pinctrl-samsung/for-next (5c8fe583cce5 Linux 5.11-rc1) Merging pwm/for-next (a2bc9b21fd3f pwm: Remove ZTE ZX driver) Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities) Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) Merging kselftest/next (e0c0840a46db selftests/seccomp: Accept any valid fd in user_notification_addfd) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") Merging livepatching/for-next (81840f21d416 Merge branch 'for-5.12/doc' 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 (49dfc1f16b03 rtc: abx80x: Add utility function for writing configuration key) Merging nvdimm/libnvdimm-for-next (2afffa101f07 cxl/mem: Remove redundant initialization of variable rc) Merging at24/at24/for-next (5366c48f327e dt-bindings: eeprom: at24: Document ROHM BR24G01) Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) Merging seccomp/for-next/seccomp (a381b70a1cf8 seccomp: Improve performace by optimizing rmb()) Merging kspp/for-next/kspp (112b6a8e038d arm64: allow LTO to be selected) CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h Merging gnss/gnss-next (45d5996e034c gnss: drop stray semicolons) Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) Merging slimbus/for-next (0320ed0a8236 drivers: slimbus: Fix word resposible -> responsible in slimbus.h) CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig Merging nvmem/for-next (667fbb3fcde1 nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer) Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) Merging hyperv/hyperv-next (3019270282a1 Revert "Drivers: hv: vmbus: Copy packets sent by Hyper-V out of the ring buffer") Merging auxdisplay/auxdisplay (b45616445a6e auxdisplay: Fix duplicate CHARLCD config symbol) Merging kgdb/kgdb/for-next (f11e2bc682cc kgdb: Remove kgdb_schedule_breakpoint()) Merging hmm/hmm (3650b228f83a Linux 5.10-rc1) Merging fpga/for-next (e41d4c011706 fpga: dfl: fme: Constify static attribute_group structs) Merging kunit/test (e71ba9452f0b Linux 5.11-rc2) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) Merging kunit-next/kunit (7af29141a31a kunit: tool: fix unintentional statefulness in run_kernel()) 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 zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) Merging mhi/mhi-next (9e04adfcab78 mhi: Fix double dma free) Merging memblock/for-next (097d43d85704 mm: memblock: remove return value of memblock_free_all()) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (e71ba9452f0b Linux 5.11-rc2) Merging iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup (636b21b50152 PCI: Revoke mappings like devmem) Applying: mm: fixup for follow_pte() API change Merging oprofile-removal/oprofile/removal (be65de6b03aa fs: Remove dcookies support) Merging akpm-current/current (e98fefb370b6 initramfs-panic-with-memory-information-fix) CONFLICT (content): Merge conflict in include/linux/pagemap.h CONFLICT (content): Merge conflict in fs/hugetlbfs/inode.c CONFLICT (content): Merge conflict in fs/btrfs/file.c Applying: fs/ramfs/inode.c: update inode_operations.tmpfile $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (fa58486ff542 MIPS: make userspace mapping young by default)
Attachment:
pgpzb0N9HQrBB.pgp
Description: OpenPGP digital signature
