Hi all, Changes since 20210603: The net-next tree gained conflicts against the net tree. The iio tree gained a conflict against the rdma tree. Non-merge commits (relative to Linus' tree): 6709 6668 files changed, 352927 insertions(+), 141851 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 331 trees (counting Linus' and 89 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 (f88cd3fb9df2 Merge tag 'vfio-v5.13-rc5' of git://github.com/awilliam/linux-vfio) Merging fixes/fixes (c06a2ba62fc4 Merge tag 'docs-5.13-3' of git://git.lwn.net/linux) Merging kbuild-current/fixes (c4681547bcce Linux 5.13-rc3) Merging arc-current/for-curr (d07f6ca923ea Linux 5.13-rc2) Merging arm-current/fixes (dad7b9896a5d ARM: 9081/1: fix gcc-10 thumb2-kernel regression) Merging arm64-fixes/for-next/fixes (e69012400b0c arm64: mm: don't use CON and BLK mapping if KFENCE is enabled) Merging arm-soc-fixes/arm/fixes (d37316b72e8b ARM: npcm: wpcm450: select interrupt controller driver) Merging drivers-memory-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging m68k-current/for-linus (34e5269bf987 m68k: sun3x: Remove unneeded semicolon) Merging powerpc-fixes/fixes (59cc84c802eb Revert "powerpc/kernel/iommu: Align size for IOMMU_PAGE_SIZE() to save TCEs") Merging s390-fixes/fixes (8124c8a6b353 Linux 5.13-rc4) 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 (1a8024239dac virtio-net: fix for skb_over_panic inside big mode) Merging bpf/master (1a8024239dac virtio-net: fix for skb_over_panic inside big mode) Merging ipsec/master (eebd49a4ffb4 xfrm: remove the fragment check for ipv6 beet mode) Merging netfilter/master (8971ee8b0877 netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches) Merging ipvs/master (56e4ee82e850 ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service) Merging wireless-drivers/master (d4826d17b393 mt76: mt7921: remove leftover 80+80 HE capability) Merging mac80211/master (bddc0c411a45 mac80211: Fix NULL ptr deref for injected rate info) Merging rdma-fixes/for-rc (a3e74fb9247c RDMA/ipoib: Fix warning caused by destroying non-initial netns) Merging sound-current/for-linus (b8b90c176026 ALSA: hda: update the power_state during the direct-complete) Merging sound-asoc-fixes/for-linus (5ad906c936dd Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus) Merging regmap-fixes/for-linus (8124c8a6b353 Linux 5.13-rc4) Merging regulator-fixes/for-linus (c3c945a3b6a9 Merge remote-tracking branch 'regulator/for-5.13' into regulator-linus) Merging spi-fixes/for-linus (3fdda0a2ec2b Merge remote-tracking branch 'spi/for-5.13' into spi-linus) Merging pci-current/for-linus (85aabbd7b315 PCI/MSI: Fix MSIs for generic hosts that use device-tree's "msi-map") Merging driver-core.current/driver-core-linus (8124c8a6b353 Linux 5.13-rc4) Merging tty.current/tty-linus (8124c8a6b353 Linux 5.13-rc4) Merging usb.current/usb-linus (8d396bb0a5b6 usb: dwc3: debugfs: Add and remove endpoint dirs dynamically) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (56df0c758aff USB: serial: omninet: update driver description) Merging usb-chipidea-fixes/for-usb-fixes (a9aecef198fa usb: cdnsp: Fix deadlock issue in cdnsp_thread_irq_handler) Merging phy/fixes (d1ce245fe409 phy: Sparx5 Eth SerDes: check return value after calling platform_get_resource()) Merging staging.current/staging-linus (8124c8a6b353 Linux 5.13-rc4) Merging iio-fixes/fixes-togreg (1ace234ba938 iio: accel: bma180: Fix BMA25x bandwidth register values) Merging char-misc.current/char-misc-linus (8124c8a6b353 Linux 5.13-rc4) Merging soundwire-fixes/fixes (da096fbccd52 soundwire: qcom: fix handling of qcom,ports-block-pack-mode) Merging thunderbolt-fixes/fixes (8124c8a6b353 Linux 5.13-rc4) Merging input-current/for-linus (45a4b68354ff Input: elants_i2c - switch to probe_new) Merging crypto-current/master (e3a606f2c544 fsverity: relax build time dependency on CRYPTO_SHA256) Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow) Merging kselftest-fixes/fixes (d07f6ca923ea Linux 5.13-rc2) Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section()) Merging dmaengine-fixes/fixes (acbef0922c7d dmaengine: ipu: fix doc warning in ipu_irq.c) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (562b4e91d3b2 mtd: parsers: ofpart: fix parsing subpartitions) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (1e67a81775cb media: s5p-mfc: Fix display delay control creation) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (78cf0eb926cb MIPS: Fix kernel hang under FUNCTION_GRAPH_TRACER and PREEMPT_TRACER) Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1) Merging omap-fixes/fixes (bae989c4bc53 ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power) Merging kvm-fixes/master (000ac4295339 selftests: kvm: fix overlapping addresses in memslot_perf_test) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) Merging hwmon-fixes/hwmon (1603eb86c6fb hwmon: (corsair-psu) fix suspend behavior) Merging nvdimm-fixes/libnvdimm-fixes (de80d5781136 Merge branch 'for-5.13/dax' into libnvdimm-fixes) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing) Merging btrfs-fixes/next-fixes (4ef0676a1677 Merge branch 'misc-5.13' 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 (b430e1d65ef6 platform/surface: aggregator: Fix event disable function) Merging samsung-krzk-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging pinctrl-samsung-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging devicetree-fixes/dt/linus (c17611592d96 dt-bindings: More removals of type references on common properties) Merging scsi-fixes/fixes (e57f5cd99ca6 scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V) Merging drm-fixes/drm-fixes (8124c8a6b353 Linux 5.13-rc4) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (b87482dfe800 Revert "i915: use io_mapping_map_user") Merging mmc-fixes/fixes (c4681547bcce Linux 5.13-rc3) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2) Merging hyperv-fixes/hyperv-fixes (6efb943b8616 Linux 5.13-rc1) Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) Merging risc-v-fixes/fixes (160ce364167f Merge remote-tracking branch 'riscv/riscv-wx-mappings' into fixes) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0) Merging spdx/spdx-linus (6799d4f2da49 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging gpio-brgl-fixes/gpio/for-current (dbec64b11c65 gpio: wcd934x: Fix shift-out-of-bounds error) Merging gpio-intel-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging pinctrl-intel-fixes/fixes (6efb943b8616 Linux 5.13-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 (d7eab3df8f39 Documentation: kunit: Update kunit_tool page) 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 (9f4ad9e425a1 Linux 5.12) Merging drm-misc-fixes/for-linux-next-fixes (0b78f8bcf495 Revert "fb_defio: Remove custom address_space_operations") Merging kspp-gustavo/for-next/kspp (53004ee78d62 xfs: Fix fall-through warnings for Clang) Merging kbuild/for-next (c39013ee64b5 kbuild: clean up ${quiet} checks in shell scripts) Merging compiler-attributes/compiler-attributes (ca0760e7d79e Compiler Attributes: Add continue in comment) Merging dma-mapping/for-next (a7f3d3d3600c dma-mapping: add unlikely hint to error path in dma_mapping_error) Merging asm-generic/master (14462376858e Merge branch 'asm-generic-unaligned' into asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (1c74bc9c743a Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (f80ccaffe0b8 Merge branch 'for-next/sve' into for-next/core) Merging arm-perf/for-next/perf (281e44f5fd4f arm64: perf: Add more support on caps under sysfs) Merging arm-soc/for-next (b433d090ac63 MAINTAINERS: ARM/Amlogic SoCs: add Neil as primary maintainer) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) Merging amlogic/for-next (b813db6e4b65 Merge branches 'v5.14/drivers' and 'v5.14/dt64' into for-next) Merging aspeed/for-next (61fbc42084f4 Merge branches 'wpcm450-for-v5.13', 'dt-for-v5.13' and 'lpc-for-v5.13' into for-next) Merging at91/at91-next (253adffb0e98 ARM: dts: at91: sama5d4: fix pinctrl muxing) Merging drivers-memory/for-next (6713da4271fd Merge branch 'for-v5.14/tegra-mc' into for-next) Merging imx-mxs/for-next (2f875c387c54 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' into next) Merging mediatek/for-next (fd450fd2a4fb Merge branch 'v5.13-next/soc' into for-next) Merging mvebu/for-next (79e93f9dc81a Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (3f89af8097bd Merge branch 'omap-for-v5.14/dt' into for-next) Merging qcom/for-next (55ac24b7e577 Merge branches 'arm64-defconfig-for-5.14', 'arm64-for-5.14', 'drivers-for-5.14' and 'dts-for-5.14' into for-next) Merging raspberrypi/for-next (fbdcf1d20126 ARM: dts: bcm2711: Add the CEC interrupt controller) CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm2711.dtsi Merging renesas/next (acad452912fc Merge branch 'renesas-arm-dt-for-v5.14' into renesas-next) Merging reset/reset/next (e207457f9045 reset: brcmstb: Add missing MODULE_DEVICE_TABLE) Merging rockchip/for-next (7bb4870abf84 Merge branch 'v5.14-armsoc/dts32' into for-next) Merging samsung-krzk/for-next (fc14c3f36825 Merge branch 'next/defconfig' into for-next) Merging scmi/for-linux-next (b83e30834a7a 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 (3dab3e1862cf ARM: dts: stm32: fix ltdc pinctrl on microdev2.0-of7) Merging sunxi/sunxi/for-next (2b4f0bf55549 Merge branches 'sunxi/clk-fixes-for-5.13', 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next) Merging tegra/for-next (6e49cb4501f6 Merge branch for-5.14/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 (69db725cdb2b arm64: dts: ti: k3-am654x/j721e/j7200-common-proc-board: Fix MCU_RGMII1_TXC direction) Merging xilinx/for-next (6efb943b8616 Linux 5.13-rc1) Merging clk/clk-next (f439944a1d13 Merge branch 'clk-qcom' into clk-next) Merging clk-imx/for-next (faa1847d03a2 clk: imx: scu: add enet rgmii gpr clocks) Merging clk-renesas/renesas-clk (790c06cc5df2 clk: renesas: r8a77995: Add ZA2 clock) Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2) Merging csky/linux-next (280af034a71d csky: Kconfig: Remove unused selects) Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) Merging m68k/for-next (b44bf9410a69 m68k: defconfig: Update defconfigs for v5.13-rc1) Merging m68knommu/for-next (8124c8a6b353 Linux 5.13-rc4) Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistake "vesion" -> "version") Merging mips/mips-next (0fe0fbc86711 MIPS: ingenic: rs90: Add dedicated VRAM memory region) 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 (8b549c18ae81 openrisc: Define memory barrier mb) Merging parisc-hd/for-next (9f4ad9e425a1 Linux 5.12) Merging powerpc/next (b73c8cccd72a powerpc/kprobes: Replace ppc_optinsn by common optinsn) Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver) Merging risc-v/for-next (cba43c31f14b riscv: Use global mappings for kernel pages) Merging s390/for-next (2417ce7ef477 Merge branch 'features' into for-next) 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 (ed102bf2afed um: Fix W=1 missing-include-dirs warnings) Merging xtensa/xtensa-for-next (21e0c3d5f633 xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG) Merging pidfd/for-next (5ddf9602d711 Merge branch 'fs.mount_setattr.nosymfollow' into for-next) Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) Merging fscache/fscache-next (3003bbd0697b afs: Use the netfs_write_begin() helper) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build") Merging btrfs/for-next (e1bde17d1592 Merge branch 'for-next-next-v5.13-20210601' into for-next-20210601) Merging ceph/master (f9f9eb473076 libceph: fix some spelling mistakes) Merging cifs/for-next (69f98828728f cifs: get rid of binding_chan and use chans_need_reconnect instead) Merging cifsd/cifsd-for-next (ce95240b5d8c Merge pull request #53 from namjaejeon/cifsd-for-next) Merging configfs/for-next (7fe1e79b59ba configfs: implement the .read_iter and .write_iter methods) 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 (ac1c889d37da erofs: clean up file headers & footers) Merging exfat/dev (b741596468b0 Merge tag 'riscv-for-linus-5.13-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging ext3/for_next (a5882ee966b1 Pull disabling of quotactl_path syscall. Merge branch 'for_next_testing' into for_next) Merging ext4/dev (7bbbf7c385ed ext4: Only advertise encrypted_casefold when encryption and unicode are enabled) Merging f2fs/dev (82a4bde500f7 f2fs: clean up /sys/fs/f2fs/<disk>/features) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl) Merging fuse/for-next (3c9c14338c12 cuse: simplify refcount) Merging jfs/jfs-next (492109333c29 fs/jfs: Fix missing error code in lmLogInit()) Merging nfs/linux-next (d1b5c230e9cb NFS: FMODE_READ and friends are C macros, not enum types) Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl) Merging nfsd/nfsd-next (da6f88115e50 nfsd4: Expose the callback address and state of each NFS4 client) Merging cel/for-next (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in svc_rqst_free()) Merging orangefs/for-next (211f9f2e0503 orangefs: leave files in the page cache for a few micro seconds at least) Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_do_getxattr()) Merging ubifs/next (9a29f7f020e0 ubi: Remove unnecessary struct declaration) Merging v9fs/9p-next (cba7dcd8878e 9p/trans_virtio: Remove sysfs file on probe failure) Merging xfs/for-next (0fe0bbe00a6f xfs: bunmapi has unnecessary AG lock ordering issues) Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone()) Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private field from ioend) Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) Merging file-locks/locks-next (cbe6fc4e0142 fs/locks: remove useless assignment in fcntl_getlk) Merging vfs/for-next (e8727aec724e Merge branch 'work.misc' into for-next) Merging printk/for-next (7e4e0a140346 Merge branch 'for-5.14-vsprintf-scanf' into for-next) Merging pci/next (6efb943b8616 Linux 5.13-rc1) Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property DT parsing support) Merging hid/for-next (84b5e4d4ad37 Merge branches 'for-5.13/upstream-fixes', 'for-5.14/core', 'for-5.14/google', 'for-5.14/intel-ish' and 'for-5.14/logitech' into for-next) Merging i2c/i2c/for-next (f879917af25f Merge branch 'i2c/for-5.14' into i2c/for-next) Applying: drm/i915/selftests: Avoid name clash with pm_ global functions Merging i3c/i3c/next (0d95f41ebde4 Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register") Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (a145de31242c hwmon: (max31790) Detect and report zero fan speed) Merging jc_docs/docs-next (6ad1800071e8 docs: Fix typos in Documentation/trace/ftrace.rst) Merging v4l-dvb/master (80c1c54a2aa3 Merge tag 'v5.13-rc4' into media_tree) Merging v4l-dvb-next/master (c11669f738f4 docs: userspace-api: media: dvb: replace some characters) Merging pm/linux-next (a25ea0c642c2 Merge branches 'pm-core' and 'pm-cpufreq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (4814d9c5d3b9 cpufreq: dt: Rename black/white-lists) Merging cpupower/cpupower (d07f6ca923ea Linux 5.13-rc2) Merging devfreq/devfreq-next (64f4d903ce9d dt-bindings: devfreq: tegra30-actmon: Add cooling-cells) Merging opp/opp/linux-next (ac9fd3c80340 opp: use list_del_init instead of list_del/INIT_LIST_HEAD) Merging thermal/thermal/linux-next (c310e546164d thermal/drivers/mtk_thermal: Remove redundant initializations of several variables) Merging dlm/next (d10a0b88751a fs: dlm: rename socket and app buffer defines) Merging swiotlb/linux-next (dfc06b389a4f swiotlb: don't override user specified size in swiotlb_adjust_size) Merging rdma/for-next (50971e39154d Merge branch 'irdma' into rdma.git for-next) Merging net-next/master (ebbf5fcb94a7 netdevsim: Fix unsigned being compared to less than zero) CONFLICT (content): Merge conflict in net/core/devlink.c CONFLICT (content): Merge conflict in drivers/net/virtio_net.c CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/stmmac_main.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/igc/igc_main.c Merging bpf-next/for-next (56b8b7f9533b selftests/bpf: Add xdp_redirect_multi into .gitignore) Merging ipsec-next/master (a925316af80a net: Remove unnecessary variables) Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations related bits) Merging netfilter-next/master (5fe8e519e44f Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next) Merging ipvs-next/master (5fe8e519e44f Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next) Merging wireless-drivers-next/master (080f9c10c773 ipw2x00: Minor documentation update) Merging bluetooth/master (e62473c516b6 Bluetooth: smp: Use the correct print format) Merging mac80211-next/master (77091933e453 net: mdio: ipq8064: enlarge sleep after read/write operation) Merging gfs2/for-next (574c26b5ca1c gfs2: Fix do_gfs2_set_flags description) Merging mtd/mtd/next (10f3b4d79958 mtd: parsers: qcom: Fix leaking of partition name) Merging nand/nand/next (c374839f9b44 mtd: spinand: macronix: Add support for serial NAND flash) Merging spi-nor/spi-nor/next (a6e2cd4dd28e mtd: spi-nor: otp: fix kerneldoc typos) Merging crypto/master (760fe22cf5e9 crypto: hisilicon/qm - update reset flow) Merging drm/drm-next (5745d647d556 Merge tag 'amd-drm-next-5.14-2021-06-02' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_gem.c Merging drm-misc/for-linux-next (610d9c311b13 drm/panel: add rotation support for Elida KD35T133 panels) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c Merging amdgpu/drm-next (07c4045ec95b drm/radeon: Add HD-audio component notifier support (v2)) Merging drm-intel/for-linux-next (514d83cb673f drm/i915/adlp: Fix AUX power well -> PHY mapping) Merging drm-tegra/drm/tegra/for-next (ecc583e22d46 drm/tegra: hub: Implement basic scaling support) Merging drm-msm/msm-next (b83fb4d242c0 drm/msm/disp: Move various debug logs to atomic bucket) Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color encoding and range properties) Merging etnaviv/etnaviv/next (4bfdd2aa67fb drm/etnaviv: rework linear window offset calculation) Merging regmap/for-next (5587eb7dbdc2 Merge remote-tracking branch 'regmap/for-5.14' into regmap-next) Merging sound/for-next (9ce650a75a3b ALSA: usb-audio: Reduce latency at playback start) Merging sound-asoc/for-next (61cd091d9226 Merge remote-tracking branch 'asoc/for-5.14' into asoc-next) Merging modules/modules-next (2c0f0f363956 module: correctly exit module_kallsyms_on_each_symbol when fn() != 0) Merging input/next (2fcbda9a822d Input: pm8941-pwrkey - add support for PMK8350 PON_HLOS PMIC peripheral) Merging block/for-next (808d854ca281 Merge branch 'for-5.14/block' into for-next) Merging device-mapper/for-next (18a20f4aed64 dm crypt: Fix zoned block device support) Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting) Merging mmc/next (92df2ba88355 mmc: mmc_spi: Imply container_of() to be no-op) Merging mfd/for-mfd-next (495fb48dbd9b mfd: wm831x: Use DEFINE_RES_IRQ_NAMED() and DEFINE_RES_IRQ() to simplify code) Merging backlight/for-backlight-next (6fc632d3e3e0 video: backlight: qcom-wled: Add PMI8994 compatible) Merging battery/for-next (b49a81d0fd02 power: supply: sbs-battery: cache constant string properties) Merging regulator/for-next (55ef1590c894 Merge remote-tracking branch 'regulator/for-5.14' 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 (dc0983f2f9b6 Merge branch 'verify-evm-portable-sig-v2' into next-integrity) 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 (1ca86ac1ec8d LSM: SafeSetID: Fix code specification by scripts/checkpatch.pl) Merging selinux/next (869cbeef18e5 lsm_audit,selinux: pass IB device name by reference) Merging smack/next (0169d8f33ab7 Revert "Smack: Handle io_uring kernel thread privileges") Merging tomoyo/master (6efb943b8616 Linux 5.13-rc1) Merging tpmdd/next (8124c8a6b353 Linux 5.13-rc4) Merging watchdog/master (c4681547bcce Linux 5.13-rc3) Merging iommu/next (a2bf39204785 Merge branch 'iommu/fixes' into next) Merging audit/next (254c8b96c4af audit: add blank line after variable declarations) Merging devicetree/for-next (67a315645385 of: Merge of_address_to_resource() and of_pci_address_to_resource() implementations) Merging mailbox/mailbox-for-next (2335f556b3af dt-bindings: mailbox: qcom-ipcc: Add compatible for SC7280) Merging spi/for-next (e7cacae458b5 Merge remote-tracking branch 'spi/for-5.14' into spi-next) Merging tip/auto-latest (24c50168409a Merge branch 'efi/core') CONFLICT (content): Merge conflict in samples/kprobes/kprobe_example.c Merging clockevents/timers/drivers/next (8120891105ba dt-bindings: timer: nuvoton,npcm7xx: Add wpcm450-timer) Merging edac/edac-for-next (e8049c4aa5d8 MAINTAINERS: Make Yazen Ghannam maintainer for EDAC-AMD64) Merging irqchip/irq/irqchip-next (fbb80d5ad400 irqchip: Remove redundant error printing) Merging ftrace/for-next (eb01f5353bda tracing: Handle %.*s in trace_check_vprintf()) Merging rcu/rcu/next (c44a4c385913 docs: Fix a typo in Documentation/RCU/stallwarn.rst) Merging kvm/next (a4345a7cecfb Merge tag 'kvmarm-fixes-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) Merging kvm-arm/next (4fda98afcac9 Merge branch kvm-arm64/mmu/MMIO-block-mapping 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 (44bada282190 KVM: s390: fix guarded storage control register handling) Merging xen-tip/linux-next (c81d3d246025 xen-pciback: reconfigure also from backend watch handler) Merging percpu/for-next (7b92d0f97d9b Merge branch 'for-5.14' into for-next) Merging workqueues/for-next (940d71c6462e wq: handle VM suspension in stall detection) Merging drivers-x86/for-next (fd9f10567ace platform/surface: aggregator: Fix event disable function) CONFLICT (content): Merge conflict in drivers/platform/surface/surface_aggregator_registry.c Merging chrome-platform/for-next (6efb943b8616 Linux 5.13-rc1) Merging hsi/for-next (6efb943b8616 Linux 5.13-rc1) Merging leds/for-next (e90abb95bc71 leds: lm36274: Add missed property.h) Merging ipmi/for-next (2253042d86f5 ipmi/watchdog: Stop watchdog timer when the current action is 'none') Merging driver-core/driver-core-next (92722bac5fe4 Merge 5.13-rc4 into driver-core-next) Merging usb/usb-next (5ff90af9da8f usb: dwc3: debugfs: Add and remove endpoint dirs dynamically) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (17cd3a106e97 USB: serial: drop irq-flags initialisations) Merging usb-chipidea-next/for-usb-next (3496993d06ff doc: dt-binding: cdns,usb3: Add interrupt-names property under required) Merging tty/tty-next (910cc9537302 Merge 5.13-rc4 into tty-next) Merging char-misc/char-misc-next (2d06954e2337 Merge 5.13-rc4 into char-misc-next) Merging extcon/extcon-next (b792cb11d39f extcon: sm5502: Add support for SM5504) Merging phy-next/next (1ed9e566f3d7 MAINTAINERS: update marvell,armada-3700-utmi-phy.yaml reference) Merging soundwire/next (1ec9d2e7936c soundwire: cadence: remove the repeated declaration) Merging thunderbolt/next (25335b30daf6 thunderbolt: Check for NVM authentication status after the operation started) Merging vfio/next (adaeb718d46f vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV) Merging staging/staging-next (cb37defbd17a Merge 5.13-rc4 into staging-next) Merging iio/togreg (eb4e91f42fc9 iio: accel: bma180: Add missing 500 Hz / 1000 Hz bandwidth) CONFLICT (content): Merge conflict in MAINTAINERS 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 (46bdcac533cc interconnect: qcom: Add SC7280 interconnect provider driver) Merging dmaengine/next (340ad031887b dmaengine: ti: omap-dma: Skip pointless cpu_pm context restore on errors) Merging cgroup/for-next (6962681ee8c6 Merge branch 'for-5.13-fixes' into for-next) Merging scsi/for-next (17f23af37bb0 Merge branch 'fixes' into for-next) Merging scsi-mkp/for-next (1ff28f229bc7 Merge branch '5.14/scsi-result' into 5.14/scsi-staging) Merging vhost/linux-next (7ff6e99e021c virtio_net: disable cb aggressively) Merging rpmsg/for-next (c86976deb21c 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 (bd56b051c96b gpio: dwapb: Switch to use fwnode_irq_get()) Merging gpio-intel/for-next (2b71b66ac041 gpio: wcove: Split error handling for CTRL and IRQ registers) Merging pinctrl/for-next (2aefadc09b35 Merge branch 'devel' into for-next) CONFLICT (content): Merge conflict in include/linux/pinctrl/pinconf-generic.h Merging pinctrl-intel/for-next (258435a1c818 pinctrl: tigerlake: Add Alder Lake-M ACPI ID) Merging pinctrl-renesas/renesas-pinctrl (85a242cdcd44 pinctrl: renesas: r8a77995: Add bias pinconf support) Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1) Merging pwm/for-next (98761ce4b91b pwm: spear: Implement .apply() callback) Merging userns/for-next (5e6b8a50a7ce cred: add missing return error code when set_cred_ucounts() failed) CONFLICT (content): Merge conflict in kernel/ucount.c CONFLICT (content): Merge conflict in kernel/signal.c CONFLICT (content): Merge conflict in include/linux/user_namespace.h CONFLICT (content): Merge conflict in include/linux/sched/user.h Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging kselftest/next (d07f6ca923ea Linux 5.13-rc2) Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' 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 (bcae59d0d45b rtc: imxdi: add wakeup support) Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next) Merging at24/at24/for-next (6efb943b8616 Linux 5.13-rc1) Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) Merging seccomp/for-next/seccomp (fe092fc9f14b selftests/seccomp: Flush benchmark output) CONFLICT (content): Merge conflict in kernel/seccomp.c Merging kspp/for-next/kspp (bf02572fb113 Merge branch 'for-next/orphans' into for-next/kspp) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (994adcbd3714 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/Makefile CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig Merging nvmem/for-next (76a2b9a8ab44 nvmem: qfprom: Improve the comment about regulator setting) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1) Merging hyperv/hyperv-next (9de6655cc5a6 drivers: hv: Fix missing error code in vmbus_connect()) Merging auxdisplay/auxdisplay (aecd79c09c2f auxdisplay: Add I2C gpio expander example) Merging kgdb/kgdb/for-next (83fa2d13d628 kdb: Refactor env variables get/set code) Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) Merging fpga/for-next (92c5ddbc93ab fpga: fpga-bridge: removed repeated word) Merging kunit/test (d07f6ca923ea Linux 5.13-rc2) Merging cfi/cfi/next (6efb943b8616 Linux 5.13-rc1) Merging kunit-next/kunit (d07f6ca923ea Linux 5.13-rc2) 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 (a610f3c65d3b bus: mhi: Wait for M2 state during system resume) Merging memblock/for-next (990e6d0e1de8 arm: extend pfn_valid to take into accound freed memory map alignment) 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 (fef0214731cc rust: allow printing in the kernel crate) CONFLICT (content): Merge conflict in kernel/printk/printk.c CONFLICT (content): Merge conflict in include/uapi/linux/android/binder.h CONFLICT (content): Merge conflict in Makefile Merging cxl/next (6630d31c912e cxl/mem: Get rid of @cxlm.base) Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' into tpmdd-for-next) Merging akpm-current/current (3f160eb715f9 linux-next-pre) CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.h CONFLICT (content): Merge conflict in arch/riscv/Kconfig $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (05de096cb377 kdump: use vmlinux_build_id to simplify)
Attachment:
pgpsQie0RPX8l.pgp
Description: OpenPGP digital signature
