linux-next: Tree for May 26

Stephen Rothwell
2021-05-26T07:46:16Z

[-- Attachment #1: Type: text/plain, Size: 34660 bytes --]

Hi all,

Changes since 20210525:

The kvm-fixes tree still had its build failure so I used the version from
next-20210524.

The userns tree gained conflicts against Linus' tree.

The akpm-current tree lost its build failure.

The akpm tree gained a conflict against the arm64-fixes tree.

Non-merge commits (relative to Linus' tree): 4749
4643 files changed, 221967 insertions(+), 74005 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 (ad9f25d33860 Merge tag 'netfs-lib-fixes-20200525' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
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 (d2f7eca60b29 ARM: 9071/1: uprobes: Don't hook on thumb instructions)
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 (d72500f99284 powerpc/64s/syscall: Fix ptrace syscall info with scv syscalls)
Merging s390-fixes/fixes (6efb943b8616 Linux 5.13-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 (6dfa87b492c0 Merge branch 'mptcp-fixes')
Merging bpf/master (1bad6fd52be4 bpf, selftests: Adjust few selftest result_unpriv outcomes)
Merging ipsec/master (b515d2637276 xfrm: xfrm_state_mtu should return at least 1280 for ipv6)
Merging netfilter/master (983c4fcb81d6 netfilter: nf_tables: extended netlink error reporting for chain type)
Merging ipvs/master (414ed7fe863a Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging wireless-drivers/master (2c2bdd2372af mt76: validate rx A-MSDU subframes)
Merging mac80211/master (b81ac7841d51 net: cdc_eem: fix URL to CDC EEM 1.0 spec)
Merging rdma-fixes/for-rc (c4681547bcce Linux 5.13-rc3)
Merging sound-current/for-linus (29c8f40b54a4 ALSA: hda/realtek: Chain in pop reduction fixup for ThinkStation P340)
Merging sound-asoc-fixes/for-linus (9a2ebf1ffb55 Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus)
Merging regmap-fixes/for-linus (d07f6ca923ea Linux 5.13-rc2)
Merging regulator-fixes/for-linus (a9ca01a0d1b8 Merge remote-tracking branch 'regulator/for-5.13' into regulator-linus)
Merging spi-fixes/for-linus (3efe28470745 Merge remote-tracking branch 'spi/for-5.13' into spi-linus)
Merging pci-current/for-linus (2ee4c8a26876 MAINTAINERS: Add Krzysztof as PCI host/endpoint controllers reviewer)
Merging driver-core.current/driver-core-linus (0c8713153fbf drivers: base: Reduce device link removal code duplication)
Merging tty.current/tty-linus (016002848c82 serial: rp2: use 'request_firmware' instead of 'request_firmware_nowait')
Merging usb.current/usb-linus (a7f2e9272aff xhci: Fix 5.12 regression of missing xHC cache clearing command after a Stall)
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 (d6eef886903c usb: cdns3: Enable TDL_CHK only for OUT ep)
Merging phy/fixes (7c2fc79250ca phy: usb: Fix misuse of IS_ENABLED)
Merging staging.current/staging-linus (54732a5322ff Merge tag 'iio-fixes-5.13b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging iio-fixes/fixes-togreg (54732a5322ff Merge tag 'iio-fixes-5.13b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (bda7d3ab06f1 kgdb: fix gcc-11 warnings harder)
Merging soundwire-fixes/fixes (da096fbccd52 soundwire: qcom: fix handling of qcom,ports-block-pack-mode)
Merging thunderbolt-fixes/fixes (22c7a18ed5f0 thunderbolt: usb4: Fix NVM read buffer bounds and offset issue)
Merging input-current/for-linus (0b1d6c8c0015 Input: xpad - map "Select" button on Microsoft Xbox One controller)
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 (538ea65a9fd1 dmaengine: xilinx: dpdma: initialize registers before request_irq)
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 (6efb943b8616 Linux 5.13-rc1)
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 (2c69c8a1736e ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet)
Merging omap-fixes/fixes (ec527f23e06a bus: ti-sysc: Fix am335x resume hang for usb otg module)
Merging kvm-fixes/master (fef7a92027dc KVM: X86: Use _BITUL() macro in UAPI headers)
$ git reset --hard HEAD^
Merging next-20210524 version of kvm-fixes
Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390)
Merging hwmon-fixes/hwmon (f0fb26c456a3 hwmon/pmbus: (q54sj108a2) The PMBUS_MFR_ID is actually 6 chars instead of 5)
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 (037239c36e72 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 (2f26dc05af87 platform/surface: aggregator_registry: Add support for 13" Intel Surface Laptop 4)
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 (2ef7665dfd88 scsi: target: qla2xxx: Wait for stop_phase1 at WWN removal)
Merging drm-fixes/drm-fixes (dd6ad0516ee3 Merge tag 'amd-drm-fixes-5.13-2021-05-19' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (e11851429fdc drm/i915: Reenable LTTPR non-transparent LT mode for DPCD_REV<1.4)
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 (bab0d47c0ebb riscv: kexec: Fix W=1 build warnings)
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 (6efb943b8616 Linux 5.13-rc1)
Merging gpio-brgl-fixes/gpio/for-current (bdbe871ef0ca gpio: tegra186: Don't set parent IRQ affinity)
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 (7cfc4ea78fc1 drm/meson: fix shutdown crash when component not probed)
Merging kspp-gustavo/for-next/kspp (135436a7d2cd xfrm: Fix fall-through warnings for Clang)
Merging kbuild/for-next (368480b21916 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 (d3506d256d94 Merge branch 'misc' into for-next)
Merging arm64/for-next/core (cb620f29c8a3 Merge branches 'for-next/caches', 'for-next/cpufeature', 'for-next/docs', 'for-next/mm', 'for-next/mte', 'for-next/perf', 'for-next/selftests', 'for-next/smccc' and 'for-next/stacktrace' into for-next/core)
Merging arm-perf/for-next/perf (2c2e21e78a94 arm64: perf: Remove redundant initialization in perf_event.c)
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 (09dc799bceb5 Merge branch 'v5.13/fixes' into tmp/aml-rebuild)
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 (969bbb49f36c Merge branch 'at91-dt' into at91-next)
Merging drivers-memory/for-next (76e5624f3f93 memory: pl353: Fix error return code in pl353_smc_probe())
Merging imx-mxs/for-next (c8b0795265b6 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 (a4578e77223a Merge branch 'omap-for-v5.14/dt' into for-next)
Merging qcom/for-next (0109038cffef Merge branches 'arm64-defconfig-for-5.13', 'arm64-for-5.13', 'defconfig-for-5.13', 'drivers-for-5.13' and 'dts-for-5.13' 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 (1931e709c701 Merge branches 'renesas-arm-defconfig-for-v5.14' and '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 (dd1599446681 Merge branch 'v5.14-clk/next' into for-next)
Merging samsung-krzk/for-next (6fed39b8b597 Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (a96dba463e18 Merge branch 'v5.13/ffa' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (6ed9269265e1 ARM: dts: stm32: Add PTP clock to Ethernet controller)
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 (93b9ea9ca307 Merge branch for-5.13/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 (547be9a05dc8 arm64: dts: ti: k3-am65-iot2050-common: Disable mailbox nodes)
Merging xilinx/for-next (6efb943b8616 Linux 5.13-rc1)
Merging clk/clk-next (6efb943b8616 Linux 5.13-rc1)
Merging clk-imx/for-next (4539b53dd2d3 clk: imx8qm: add clock valid resource checking)
Merging clk-renesas/renesas-clk (eecee036223d clk: renesas: cpg-mssr: Make srstclr[] comment block consistent)
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 (eeff86b6d18c m68k: dma: Remove unnecessary include of asm/cacheflush.h)
Merging m68knommu/for-next (c4681547bcce Linux 5.13-rc3)
Merging microblaze/next (6efb943b8616 Linux 5.13-rc1)
Merging mips/mips-next (33ae8f801ad8 hugetlb: clear huge pte during flush function on mips platform)
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 (11c2f6c1b303 Merge remote-tracking branches 'riscv/next-misc' and 'riscv/fixes' into for-next)
Merging s390/for-next (6efb943b8616 Linux 5.13-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 (ed102bf2afed um: Fix W=1 missing-include-dirs warnings)
Merging xtensa/xtensa-for-next (6a8eb99e130f xtensa: ISS: add GDBIO implementation to semihosting interface)
Merging pidfd/for-next (2ca4dcc4909d fs/mount_setattr: tighten permission checks)
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 (0471d45f52a0 Merge branch 'for-next-next-v5.13-20210525' into for-next-20210525)
Merging ceph/master (f8234d7b1fb3 libceph: kill ceph_none_authorizer::reply_buf)
Merging cifs/for-next (7d1da3f1649d cifs: change format of CIFS_FULL_KEY_DUMP ioctl)
Merging cifsd/cifsd-for-next (4ead0568f798 Merge pull request #49 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 (c439c3306fea erofs: remove the occupied parameter from z_erofs_pagevec_enqueue())
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 (6c0912739699 ext4: wipe ext4_dir_entry2 upon file deletion)
Merging f2fs/dev (cc9a9ddc4616 f2fs: avoid attaching SB_ACTIVE flag during mount/remount)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (3c9c14338c12 cuse: simplify refcount)
Merging jfs/jfs-next (cf1031ed4752 jfs: Remove trailing semicolon in macros)
Merging nfs/linux-next (d275880abce9 SUNRPC: Fix Oops in xs_tcp_send_request() when transport is disconnected)
Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing system.nfs4_acl)
Merging nfsd/nfsd-next (1808d90e8458 NFSD add vfs_fsync after async copy is done)
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 (e3c2b047475b xfs: restore old ioctl definitions)
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 (2d66d9a31ab7 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 (5b95bf4cc297 Merge branch 'for-5.13/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (1ffa3864e86b Merge branch 'i2c/for-current' into i2c/for-next)
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 (34569e775e39 docs: hwmon: Add an entry for mp2888)
Merging jc_docs/docs-next (0e7c52da1ab8 Documentation: checkpatch: Tweak BIT() macro include)
Merging v4l-dvb/master (bb9212fd9710 media: ARM: dts: sama5d4: enable Hantro G1 VDEC)
Merging v4l-dvb-next/master (71c689dc2e73 media: v4l2-ctrls: split up into four source files)
Merging pm/linux-next (bf15f94bdcd8 Merge branch 'acpi-misc' 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 (a15fc9aa5b38 PM / devfreq: imx8m-ddrc: Remove DEVFREQ_GOV_SIMPLE_ONDEMAND dependency)
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 (706474fbc5fe fs: dlm: don't allow half transmitted messages)
Merging swiotlb/linux-next (dfc06b389a4f swiotlb: don't override user specified size in swiotlb_adjust_size)
Merging rdma/for-next (331859d320f5 RDMA/hns: Remove unused CMDQ member)
Merging net-next/master (e4e92ee78702 net: wwan: core: Add WWAN device index sysfs attribute)
Applying: usb: class: cdc-wdm: fix for kill_urbs() removal
Merging bpf-next/for-next (a720a2a0ad6c xsk: Use kvcalloc to support large umems)
Merging ipsec-next/master (fe9f1d8779cb xfrm: add state hashtable keyed by seq)
Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations related bits)
Merging netfilter-next/master (845064d752ce netfilter: Remove leading spaces in Kconfig)
CONFLICT (content): Merge conflict in net/netfilter/nft_set_pipapo.c
Applying: fix up for merge involving nft_pipapo_lookup()
Merging ipvs-next/master (ea89c862f01e net: mana: Use struct_size() in kzalloc())
Merging wireless-drivers-next/master (6efb943b8616 Linux 5.13-rc1)
Merging bluetooth/master (c7e1e7ccd606 Bluetooth: Translate additional address type during le_conn_comp)
Merging mac80211-next/master (77091933e453 net: mdio: ipq8064: enlarge sleep after read/write operation)
Merging gfs2/for-next (75069590915f gfs2: Fix do_gfs2_set_flags description)
Merging mtd/mtd/next (cc9d663a00a0 drivers: mtd: sm_ftl: Fix alignment of block comment)
Merging nand/nand/next (fd0d8d85f723 mtd: nand: bbt: Fix corner case in bad block table handling)
Merging spi-nor/spi-nor/next (c4681547bcce Linux 5.13-rc3)
Merging crypto/master (a6f8e68e238a crypto: ccp - Fix a resource leak in an error handling path)
Merging drm/drm-next (9a91e5e0af5e Merge tag 'amd-drm-next-5.14-2021-05-21' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_mm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Merging drm-misc/for-linux-next (e1543d83ed55 drm/amdgpu: Fix crash when hot unplug in BACO)
Merging amdgpu/drm-next (da79c46085ec drm/radeon: Add HD-audio component notifier support (v2))
Merging drm-intel/for-linux-next (3cdef2a9f27d drm/i915/display/adl_p: Disable PSR2)
Merging drm-tegra/drm/tegra/for-next (c79184a9c029 drm/tegra: Fix shift overflow in tegra_shared_plane_atomic_update)
Merging drm-msm/msm-next (8dbde399044b drm/msm/dp: handle irq_hpd with sink_count = 0 correctly)
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 (dfde31c9d10f Merge remote-tracking branch 'regmap/for-5.14' into regmap-next)
Merging sound/for-next (08e767cd9e8b ALSA: control_led - use DEVICE_ATTR_*() macro)
Merging sound-asoc/for-next (ad321de079e1 Merge remote-tracking branch 'asoc/for-5.14' into asoc-next)
Merging modules/modules-next (02b2fb455b2e kernel/module: Use BUG_ON instead of if condition followed by BUG)
Merging input/next (fb082cd59afa Input: resistive-adc-touch - add support for z1 and z2 channels)
Merging block/for-next (6bcec6cee54e Merge branch 'for-5.14/io_uring' into for-next)
Merging device-mapper/for-next (efeea63ec531 dm space map disk: cache a small number of index entries)
Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting)
Merging mmc/next (47f4bdf989c0 mmc: sdhci-of-aspeed: Configure the SDHCIs as specified by the devicetree.)
Merging mfd/for-mfd-next (550d489184a0 Revert "MAINTAINERS: Add entry for Intel MAX 10 mfd driver")
Merging backlight/for-backlight-next (190ccab3185e backlight: rt4831: Adds support for Richtek RT4831 backlight)
Merging battery/for-next (2aac79d14d76 power: supply: sc2731_charger: Add missing MODULE_DEVICE_TABLE)
Merging regulator/for-next (67fb42566de9 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 (49219d9b8785 evm: fix writing <securityfs>/evm overflow)
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 (8ac91e6c6033 Merge tag 'for-5.13-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging watchdog/master (c4681547bcce Linux 5.13-rc3)
Merging iommu/next (54c80d907400 iommu/vt-d: Use user privilege for RID2PASID translation)
Merging audit/next (254c8b96c4af audit: add blank line after variable declarations)
Merging devicetree/for-next (70c1fc34f3c6 dt-bindings: rng: mediatek: add mt8365 to mtk rng binding)
Merging mailbox/mailbox-for-next (2335f556b3af dt-bindings: mailbox: qcom-ipcc: Add compatible for SC7280)
Merging spi/for-next (aa946f04d384 Merge remote-tracking branch 'spi/for-5.14' into spi-next)
Merging tip/auto-latest (19c0a3af4ad1 Merge branch 'efi/core')
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 (51e76b6b526f rcu-tasks: Mark ->trc_reader_special.b.need_qs data races)
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 (9a8aae605b80 Merge branch 'kvm-arm64/kill_oprofile_dependency' 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 (0ab8359fd8cd platform/x86: thinkpad_acpi: Fix inconsistent indenting)
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 (ee522bcf026e leds: tlc591xx: fix return value check in tlc591xx_probe())
Merging ipmi/for-next (2253042d86f5 ipmi/watchdog: Stop watchdog timer when the current action is 'none')
Merging driver-core/driver-core-next (fd03c075e362 drivers/base/node.c: make CACHE_ATTR define static DEVICE_ATTR_RO)
Merging usb/usb-next (a0765597c986 usb: typec: tcpci: Make symbol 'tcpci_apply_rc' static)
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 (4ae08bc23e1b usb: cdnsp: Useless condition has been removed)
Merging tty/tty-next (2ac62268a2c0 tty: hvc_console: Remove the repeated words 'no' and 'from')
Merging char-misc/char-misc-next (281e46844699 misc: alcor_pci: fix inverted branch condition)
Merging extcon/extcon-next (08a268ddb5e2 extcon: max8997: Add missing modalias string)
Merging phy-next/next (490dbd2380c7 phy: phy-core-mipi-dphy.c: Correct reference version)
Merging soundwire/next (037219925e7a soundwire: dmi-quirks: remove duplicate initialization)
Merging thunderbolt/next (c4681547bcce Linux 5.13-rc3)
Merging vfio/next (adaeb718d46f vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV)
Merging staging/staging-next (1b4c0f3bbdbd staging: rtl8723bs: rename get_ra() due to global symbol collision)
Merging iio/togreg (301f7eba67df iio: adc: ti-adc161s626: Use devm managed functions for all of probe.)
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 (1fd86e280d8b interconnect: qcom: Add missing MODULE_DEVICE_TABLE)
Merging dmaengine/next (6f64aa5746d2 dt-bindings: dma: convert arm-pl08x to yaml)
Merging cgroup/for-next (6962681ee8c6 Merge branch 'for-5.13-fixes' into for-next)
Merging scsi/for-next (31ff791600e3 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (ea2f0f77538c scsi: core: Cap scsi_host cmd_per_lun at can_queue)
Merging vhost/linux-next (7ff6e99e021c virtio_net: disable cb aggressively)
Merging rpmsg/for-next (dc0e14fa833b 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 (0533260687a7 gpio: wm8350: remove platform_set_drvdata() + cleanup probe)
Merging gpio-intel/for-next (2b71b66ac041 gpio: wcove: Split error handling for CTRL and IRQ registers)
Merging pinctrl/for-next (9f96bd5ae866 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 (904ec4bebc1d pinctrl: renesas: r8a779{51,6,65}: Reduce non-functional differences)
Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1)
Merging pwm/for-next (98761ce4b91b pwm: spear: Implement .apply() callback)
Merging userns/for-next (f928ef685db5 ucounts: Silence warning in dec_rlimit_ucounts)
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 (a3fc712c5b37 seccomp: Fix "cacheable" typo in comments)
Merging kspp/for-next/kspp (f4a35e00d248 Merge branch 'for-next/clang/features' 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 (d1a5f4ca656b nvmem: qfprom: minor nit fixes)
Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
Merging hyperv/hyperv-next (c6a8625fa4c6 hv_utils: Fix passing zero to 'PTR_ERR' warning)
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 (ded39fc4a5b4 docs: driver-api: fpga: avoid using UTF-8 chars)
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 (35c32e3095d3 cxl/docs: Fix "Title underline too short" warning)
Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' into tpmdd-for-next)
Merging akpm-current/current (312889e44cff linux-next-pre)
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
CONFLICT (content): Merge conflict in arch/arm64/mm/mmu.c
Merging akpm/master (3217f714cbde kdump: use vmlinux_build_id to simplify)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]