From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,LOCALPART_IN_SUBJECT, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6D99C433ED for ; Thu, 22 Apr 2021 09:48:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6949A601FF for ; Thu, 22 Apr 2021 09:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235712AbhDVJsn (ORCPT ); Thu, 22 Apr 2021 05:48:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235583AbhDVJsm (ORCPT ); Thu, 22 Apr 2021 05:48:42 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C794C06174A; Thu, 22 Apr 2021 02:48:07 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4FQszl553Wz9sW5; Thu, 22 Apr 2021 19:48:03 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1619084883; bh=OCAexKd0akRgB8GHFxELOr9bVzjSSr1y9Vwc4bbXuMY=; h=Date:From:To:Cc:Subject:From; b=NTwAyG1vVT5oLi22F8+EzKxBRlLTNJb17l2uC1fCdAYejQTOIma7T3YaFhQeJcJco JSBXUDFF/nzHXN+HNsTv6WAMT0XI/Sc2B6Fe+0FQuXa/S214D5BBHitKFsxScAZMxU 59NiR8fn2XksDvcT4sJ+2fjbgvcejc7Ap7f0aKfca+bE1ZEnHRp5NIT/P5oCZCboZ6 SsCvfeX7sNWPLUwNr+Q8CapwCOAdorBvciSGLAzrPU3jf5JVbGFyFvBF0KXXuvohYa /TckuwpkMi1/QBr8WaIRnM03qft8/086ZtZmLaVxEdEDj/S8G81G2F7t8kRhZpIxps nhVsNXJtxBgxQ== Date: Thu, 22 Apr 2021 19:48:02 +1000 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Apr 22 Message-ID: <20210422194802.593273a7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/RRLmoOIyqTU1zFtzSU+YMKD"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/RRLmoOIyqTU1zFtzSU+YMKD Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20210421: New tree: tpmdd-jejb The vfs tree gained a conflict against the csky tree. The rcu tree gained a build failure so I used the version from next-20210421. The kvm tree gained conficts against Linus` tree, the mips tree and the tip tree. The kvm-arm tree gained conficts against the kvm tree. The cgroup tree gained conficts and a semantic conflict against the kvm tree. Non-merge commits (relative to Linus' tree): 13431 11540 files changed, 642373 insertions(+), 282802 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 341 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. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (16fc44d6387e Merge tag 'mmc-v5.12-rc5' of git://git.= kernel.org/pub/scm/linux/kernel/git/ulfh/mmc) Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) Merging kbuild-current/fixes (bcbcf50f5218 kbuild: fix ld-version.sh to not= be affected by locale) Merging arc-current/for-curr (163630b2d95b arc: Fix typos/spellos) Merging arm-current/fixes (d2f7eca60b29 ARM: 9071/1: uprobes: Don't hook on= thumb instructions) Merging arm64-fixes/for-next/fixes (22315a2296f4 arm64: alternatives: Move = length validation in alternative_{insn, endif}) Merging arm-soc-fixes/arm/fixes (b9a9786a13ea Merge tag 'omap-for-v5.12/fix= es-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linu= x-omap into arm/fixes) Merging drivers-memory-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging m68k-current/for-linus (a65a802aadba m68k: Fix virt_addr_valid() W= =3D1 compiler warnings) Merging powerpc-fixes/fixes (791f9e36599d powerpc/vdso: Make sure vdso_wrap= per.o is rebuilt everytime vdso.so is rebuilt) Merging s390-fixes/fixes (a994eddb947e s390/entry: save the caller of psw_i= dle) Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linu= x/kernel/git/netdev/net) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryp= tion not used on new files) Merging net/master (eefb45eef5c4 neighbour: Prevent Race condition in neigh= bour subsytem) Merging bpf/master (b02265429681 Merge git://git.kernel.org/pub/scm/linux/k= ernel/git/bpf/bpf) Merging ipsec/master (b515d2637276 xfrm: xfrm_state_mtu should return at le= ast 1280 for ipv6) Merging netfilter/master (4acd47644ef1 MAINTAINERS: update) Merging ipvs/master (ccb39c628558 Merge git://git.kernel.org/pub/scm/linux/= kernel/git/pablo/nf) Merging wireless-drivers/master (e7020bb068d8 iwlwifi: Fix softirq/hardirq = disabling in iwl_pcie_gen2_enqueue_hcmd()) Merging mac80211/master (88a5af943985 Merge tag 'net-5.12-rc8' of git://git= .kernel.org/pub/scm/linux/kernel/git/netdev/net) Merging rdma-fixes/for-rc (d434405aaab7 Linux 5.12-rc7) Merging sound-current/for-linus (c8426b2700b5 ALSA: hda/realtek: Fix speake= r amp setup on Acer Aspire E1) Merging sound-asoc-fixes/for-linus (a5a7236ac6db Merge remote-tracking bran= ch 'asoc/for-5.12' into asoc-linus) Merging regmap-fixes/for-linus (78d889705732 Merge remote-tracking branch '= regmap/for-5.12' into regmap-linus) Merging regulator-fixes/for-linus (1ac6259a2306 Merge remote-tracking branc= h 'regulator/for-5.12' into regulator-linus) Merging spi-fixes/for-linus (d6c5a76eece6 Merge remote-tracking branch 'spi= /for-5.12' into spi-linus) Merging pci-current/for-linus (cf673bd0cc97 PCI: switchtec: Fix Spectre v1 = vulnerability) Merging driver-core.current/driver-core-linus (d434405aaab7 Linux 5.12-rc7) Merging tty.current/tty-linus (e49d033bddf5 Linux 5.12-rc6) Merging usb.current/usb-linus (d434405aaab7 Linux 5.12-rc7) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (0d02ec6b3136 Linux 5.12-rc4) Merging usb-chipidea-fixes/for-usb-fixes (92b9f4d145ef usb: cdns3: Fix runt= ime PM imbalance on error) Merging phy/fixes (da848f9a0e13 phy: qcom-qmp: add hbr3_hbr2 voltage and pr= emphasis swing table) Merging staging.current/staging-linus (e49d033bddf5 Linux 5.12-rc6) Merging iio-fixes/fixes-togreg (07581af31098 iio: hid-sensors: select IIO_T= RIGGERED_BUFFER under HID_SENSOR_IIO_TRIGGER) Merging char-misc.current/char-misc-linus (e49d033bddf5 Linux 5.12-rc6) Merging soundwire-fixes/fixes (fde5d7f27108 soundwire: bus: Fix device foun= d flag correctly) Merging thunderbolt-fixes/fixes (bf05bf16c76b Linux 5.12-rc8) Merging input-current/for-linus (56cfe6f820a6 Input: elants_i2c - drop zero= -checking of ABS_MT_TOUCH_MAJOR resolution) 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 (909290786ea3 vfio/pci: Add missing range chec= k in vfio_pci_mmap) Merging kselftest-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure= to pass all module source files to spatch) Merging dmaengine-fixes/fixes (ea9aadc06a9f dmaengine: idxd: fix wq cleanup= of WQCFG registers) Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2) Merging mtd-fixes/mtd/fixes (2fb164f0ce95 mtd: rawnand: mtk: Fix WAITRDY br= eak condition and timeout) Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Re= vert "Constify static struct resources") Merging v4l-dvb-fixes/fixes (0e37b4fa67f5 media: coda: fix macroblocks coun= t control usage) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified= HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (9ae31e2ab293 MIPS: kernel: setup.c: fix comp= ilation error) Merging at91-fixes/at91-fixes (2c69c8a1736e ARM: dts: at91: sam9x60: fix mu= x-mask to match product's datasheet) Merging omap-fixes/fixes (fc85dc42a384 ARM: OMAP2+: Fix uninitialized sr_in= st) Merging kvm-fixes/master (04c4f2ee3f68 KVM: VMX: Don't use vcpu->run->inter= nal.ndata as an array index) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KV= M/s390) Merging hwmon-fixes/hwmon (a38fd8748464 Linux 5.12-rc2) Merging nvdimm-fixes/libnvdimm-fixes (99a81dcc717d Merge branch 'for-5.12/c= xl' into libnvdimm-fixes) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity p= robing) Merging btrfs-fixes/next-fixes (3b7ec4d1b5cb Merge branch 'misc-5.12' into = next-fixes) Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra fil= e attributes for statx()) Merging dma-mapping-fixes/for-linus (d17405d52bac dma-mapping: benchmark: f= ix kernel crash when dma_map_single fails) Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) Merging drivers-x86-fixes/fixes (a3790a8a94fc platform/x86: intel-hid: Fix = spurious wakeups caused by tablet-mode events during suspend) Merging samsung-krzk-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging pinctrl-samsung-fixes/fixes (a38fd8748464 Linux 5.12-rc2) Merging devicetree-fixes/dt/linus (d473d32c2fba of: property: fw_devlink: d= o not link ".*,nr-gpios") Merging scsi-fixes/fixes (176ddd89171d scsi: libsas: Reset num_scatter if l= ibata marks qc as NODATA) Merging drm-fixes/drm-fixes (796b556cbfdb Merge tag 'vmwgfx-fixes-2021-04-1= 4' of gitlab.freedesktop.org:zack/vmwgfx 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 (2d292995bb8f Merge tag 'gvt-f= ixes-2021-04-20' of https://github.com/intel/gvt-linux into drm-intel-fixes) Merging mmc-fixes/fixes (7412dee9f1fd mmc: meson-gx: replace WARN_ONCE with= dev_warn_once about scatterlist size alignment in block mode) Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around dir= ect invocation of cmos_interrupt()) Merging gnss-fixes/gnss-linus (a38fd8748464 Linux 5.12-rc2) Merging hyperv-fixes/hyperv-fixes (37df9f3fedb6 video: hyperv_fb: Fix a dou= ble free in hvfb_probe) Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask thr= ough cpumask_of(cpu)) Merging risc-v-fixes/fixes (7ae11635ec90 riscv: keep interrupts disabled fo= r BREAKPOINT exception) Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_ran= ge()) Merging fpga-fixes/fixes (2e8496f31d0b firmware: stratix10-svc: reset COMMA= ND_RECONFIG_FLAG_PARTIAL to 0) Merging spdx/spdx-linus (e49d033bddf5 Linux 5.12-rc6) Merging gpio-brgl-fixes/gpio/for-current (ddd8d94ca31e gpio: omap: Save and= restore sysconfig) Merging gpio-intel-fixes/fixes (b41ba2ec54a7 gpiolib: Read "gpio-line-names= " from a firmware node) Merging pinctrl-intel-fixes/fixes (196d94175329 pinctrl: lewisburg: Update = number of pins in community) Merging erofs-fixes/fixes (9f377622a484 erofs: fix bio->bi_max_vecs behavio= r change) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_d= esc()) Merging kunit-fixes/kunit-fixes (7fd53f41f771 kunit: tool: Disable PAGE_POI= SONING under --alltests) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not di= rty 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 (e49d033bddf5 Linux 5.12-rc6) Merging drm-misc-fixes/for-linux-next-fixes (ffe8768fb8f3 drm/vc4: remove u= nused function) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warn= ings for Clang) Merging kbuild/for-next (41d9d7e059e8 Merge branch 'kconfig' into for-next) Merging compiler-attributes/compiler-attributes (19c329f68089 Linux 5.11-rc= 4) Merging dma-mapping/for-next (a7f3d3d3600c dma-mapping: add unlikely hint t= o error path in dma_mapping_error) Merging asm-generic/master (38489db09b10 Merge branch 'asm-generic-fixes' i= nto asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (d744d01b03f7 Merge branches 'fixes' and 'misc' into f= or-next) Merging arm64/for-next/core (a27a88165689 Merge branch 'for-next/pac-set-ge= t-enabled-keys' into for-next/core) CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpucaps.h Merging arm-perf/for-next/perf (2c2e21e78a94 arm64: perf: Remove redundant = initialization in perf_event.c) Merging arm-soc/for-next (35a77f812374 soc: document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add = ATC2603C PMIC) Merging amlogic/for-next (c79e44de74f9 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 (93567c59f9b0 Merge branch 'mem-ctrl-next' = into for-next) Merging imx-mxs/for-next (1f0f76f795d5 Merge branch 'imx/defconfig' into fo= r-next) Merging keystone/next (9d2e21ed98a2 Merge branch 'for_5.12/drivers-soc' int= o next) Merging mediatek/for-next (068acd3c4e4c Merge branch 'v5.12-next/dts64-2' i= nto for-next) Merging mvebu/for-next (79e93f9dc81a Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (44e97f6fb29b Merge branch 'fixes' into for-next) Merging qcom/for-next (0109038cffef Merge branches 'arm64-defconfig-for-5.1= 3', '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 i= nterrupt controller) CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm2711.dtsi Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (e9903a1559e0 Merge branch 'renesas-arm-dt-for-v5.13' = into renesas-next) Merging reset/reset/next (d4e4dffec50b reset: oxnas: replace file name with= short description) Merging rockchip/for-next (f40c51456fe0 Merge branch 'v5.13-armsoc/dts64' i= nto for-next) Merging samsung-krzk/for-next (8a4d4cd15c39 Merge branch 'next/soc' into fo= r-next) Merging scmi/for-linux-next (bf05bf16c76b Linux 5.12-rc8) Merging stm32/stm32-next (6ed9269265e1 ARM: dts: stm32: Add PTP clock to Et= hernet controller) Merging sunxi/sunxi/for-next (9fa021aa01fd Merge tags 'sunxi-dt-for-5.13-1'= and 'sunxi-fixes-for-5.12' into sunxi/for-next) Merging tegra/for-next (93b9ea9ca307 Merge branch for-5.13/arm64/dt into fo= r-next) Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' int= o ti-k3-next) Merging ti-k3-new/ti-k3-next (112e5934ff3a arm64: dts: ti: k3-am64-main: Fi= x ospi compatible) Merging xilinx/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging clk/clk-next (e3efa50969a8 Merge branch 'clk-ralink' into clk-next) Merging clk-imx/for-next (054ef44ea3ef clk: imx: Reference preceded by free) Merging clk-renesas/renesas-clk (f2fb4fe62390 clk: renesas: Zero init clk_i= nit_data) Merging clk-samsung/for-next (7f32917642c7 clk: samsung: Remove redundant d= ev_err calls) Merging csky/linux-next (d3900e8d918f csky: uaccess.h: Coding convention wi= th asm generic) Merging h8300/h8300-next (6e5e55227c95 Merge tag 'v5.11' into h8300-next) Merging m68k/for-next (34e5269bf987 m68k: sun3x: Remove unneeded semicolon) Merging m68knommu/for-next (04d82a6d0881 binfmt_flat: allow not offsetting = data start) Merging microblaze/next (bbcee72c2f7a microblaze: Fix a typo) Merging mips/mips-next (182dd5bad52c lib/math/test_div64: Fix error message= formatting) Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to ) Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating = min_low_pfn) Merging openrisc/for-next (1683f7de65db soc: litex: Remove duplicated heade= r file inclusion) Merging parisc-hd/for-next (711d090f0e02 parisc: syscalls: switch to generi= c syscallhdr.sh) Merging powerpc/next (39352430aaa0 powerpc: Move copy_inst_from_kernel_nofa= ult()) Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridg= es) Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM dr= iver) Merging risc-v/for-next (e9efb21fe352 riscv: Prepare ptdump for vm layout d= ynamic addresses) Merging s390/for-next (246f3bc6ded3 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=3D1 missing-include-dirs war= nings) Merging xtensa/xtensa-for-next (6a8eb99e130f xtensa: ISS: add GDBIO impleme= ntation to semihosting interface) Merging pidfd/for-next (8fac44cbbaa2 Merge branch 'fs/idmapped_mounts/helpe= rs' into for-next) Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with uns= upported encryption policy) Merging fscache/fscache-next (3b541757ad58 afs: Use the netfs_write_begin()= helper) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build= ") Merging btrfs/for-next (8a03ef87ec7e Merge branch 'for-next-next-v5.13-2021= 0420' into for-next-20210420) Merging ceph/master (558b4510f622 ceph: defer flushing the capsnap if the F= b is used) Merging cifs/for-next (f3f259910c09 Cifs: Fix kernel oops caused by deferre= d close for files.) Merging cifsd/cifsd-for-next (7e6448ce1c08 Merge pull request #41 from namj= aejeon/cifsd-for-next) Merging configfs/for-next (14fbbc829772 configfs: fix a use-after-free in _= _configfs_open_file) Merging ecryptfs/next (9046625511ad ecryptfs: fix kernel panic with null de= v_name) Merging erofs/dev (8e6c8fa9f2e9 erofs: enable big pcluster feature) Merging exfat/dev (f9b23f1f6ca0 exfat: speed up iterate/lookup by fixing st= art point of traversing cluster chain) Merging ext3/for_next (bf7ea7068a02 Pull reiserfs cleanup.) Merging ext4/dev (4811d9929cda ext4: allow the dax flag to be set and clear= ed on inline directories) Merging f2fs/dev (a7b4e506dcc4 f2fs: remove unnecessary struct declaration) Merging fsverity/fsverity (07c99001312c fs-verity: support reading signatur= e with ioctl) Merging fuse/for-next (3c9c14338c12 cuse: simplify refcount) Merging jfs/jfs-next (b462cecfa323 fs: Fix typo issue) Merging nfs/linux-next (d99f2487e1de NFS: The 'fattr_valid' field in struct= nfs_server should be unsigned int) Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing sy= stem.nfs4_acl) Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf ev= ent class) Merging cel/for-next (76c50eb70d8e nfsd: Fix fall-through warnings for Clan= g) Merging orangefs/for-next (c1048828c3db orangefs: add splice file operation= s) 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 (f8b139e2f241 fs: 9p: fix v9fs_file_open writeback fid= error check) Merging xfs/for-next (76adf92a30f3 xfs: remove xfs_quiesce_attr declaration) Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt co= rrectly in zonefs_open_zone()) Merging iomap/iomap-for-next (ad89b66cbad1 iomap: improve the warnings from= iomap_swapfile_activate) 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 assign= ment in fcntl_getlk) Merging vfs/for-next (e8727aec724e Merge branch 'work.misc' into for-next) CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c CONFLICT (content): Merge conflict in fs/overlayfs/file.c CONFLICT (content): Merge conflict in fs/f2fs/namei.c CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c CONFLICT (content): Merge conflict in arch/csky/include/asm/uaccess.h Merging printk/for-next (94a67011a225 Merge branch 'for-5.13' into for-next) Merging pci/next (e4e573c9a390 Merge branch 'remotes/lorenzo/pci/misc') Merging pstore/for-next/pstore (9d843e8fafc7 pstore: Add mem_type property = DT parsing support) Merging hid/for-next (2b84a0f6c2c2 Merge branch 'for-5.13/wacom' into for-n= ext) Merging i2c/i2c/for-next (f9743e4d0a62 Merge branch 'i2c/for-5.13' into i2c= /for-next) Merging i3c/i3c/next (e43d5c7c3c34 dt-bindings: i3c: Fix silvaco,i3c-master= -v1 compatible string) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has= moved) Merging hwmon-staging/hwmon-next (9049572fb145 hwmon: Remove amd_energy dri= ver) Merging jc_docs/docs-next (441ca977a84d docs/zh_CN: add openrisc translatio= n to zh_CN index) Merging v4l-dvb/master (0b276e470a4d media: coda: fix macroblocks count con= trol usage) CONFLICT (content): Merge conflict in MAINTAINERS Merging v4l-dvb-next/master (bf05bf16c76b Linux 5.12-rc8) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo = in imxfb_probe()) Merging pm/linux-next (304bbea920d3 Merge branch 'devprop' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (dbbd49bade05 cpufreq: armada-37= xx: Fix module unloading) Merging cpupower/cpupower (a38fd8748464 Linux 5.12-rc2) Merging devfreq/devfreq-next (0a7dc8318c28 PM / devfreq: imx8m-ddrc: Remove= unneeded of_match_ptr()) Merging opp/opp/linux-next (a8bb0e872bfb memory: samsung: exynos5422-dmc: C= onvert to use resource-managed OPP API) Merging thermal/thermal/linux-next (fc88f7ad763a thermal/drivers/tegra: Use= devm_platform_ioremap_resource_byname) Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pur= e OF sensor) Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not u= sed variable 'guid') Merging dlm/next (2fd8db2dd05d fs: dlm: fix missing unlock on error in acce= pt_from_sock()) Merging swiotlb/linux-next (2726bf3ff252 swiotlb: Make SWIOTLB_NO_FORCE per= form no allocation) Merging rdma/for-next (45062f441590 RDMA/rxe: Fix a bug in rxe_fill_ip_info= ()) CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/hfi.h Merging net-next/master (5d869070569a net: phy: marvell: don't use empty sw= itch default case) CONFLICT (content): Merge conflict in net/nfc/nci/uart.c Merging bpf-next/for-next (d044d9fc1380 selftests/bpf: Add docs target as a= ll dependency) Merging ipsec-next/master (747b67088f8d xfrm: ipcomp: remove unnecessary ge= t_cpu()) Merging mlx5-next/mlx5-next (63f9c44bca5e net/mlx5: Add MEMIC operations re= lated bits) Merging netfilter-next/master (e9377a911d77 ethtool: add missing EEPROM to = list of messages) Merging ipvs-next/master (b72920f6e4a9 netfilter: nftables: counter hardwar= e offload support) Merging wireless-drivers-next/master (afda33499bea rtlwifi: implement set_t= im by update beacon content) Merging bluetooth/master (1c55c39f8232 Bluetooth: cmtp: fix file refcount w= hen cmtp_attach_device fails) Merging mac80211-next/master (010bfbe768f7 cfg80211: scan: drop entry from = hidden_list on overflow) Merging gfs2/for-next (e5966cf20f0c gfs2: Fix fall-through warnings for Cla= ng) Merging mtd/mtd/next (a881537dfaf2 Revert "mtd: rawnand: bbt: Skip bad bloc= ks when searching for the BBT in NAND") Merging nand/nand/next (32cbc7cb70b0 mtd: rawnand: qcom: Use dma_mapping_er= ror() for error check) Merging spi-nor/spi-nor/next (46094049a49b Revert "mtd: spi-nor: macronix: = Add support for mx25l51245g") Merging crypto/master (0f049f7d11dc crypto: crc32-generic - Use SPDX-Licens= e-Identifier) Merging drm/drm-next (af8352f1ff54 Merge tag 'drm-msm-next-2021-04-11' of h= ttps://gitlab.freedesktop.org/drm/msm into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_mob.c CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c Applying: merge fix for "drm: Switch to %p4cc format modifier" Merging drm-misc/for-linux-next (a4394b6d0a27 drm/ttm: Don't count pages in= SG BOs against pages_limit) Merging amdgpu/drm-next (412562f57627 drm/amdgpu: Add graphics cache rinse = packet for sdma 5.0) Merging drm-intel/for-linux-next (e65a4d378480 Merge tag 'gvt-next-fixes-20= 21-04-21' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) Merging drm-tegra/drm/tegra/for-next (c79184a9c029 drm/tegra: Fix shift ove= rflow in tegra_shared_plane_atomic_update) Merging drm-msm/msm-next (a29c8c024165 drm/msm/disp/dpu1: fix display under= runs during modeset.) Merging imx-drm/imx-drm/next (74181df8c6db drm/imx: ipuv3-plane: Remove two= unnecessary export symbols) CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c Merging etnaviv/etnaviv/next (7d614ab2f205 drm/etnaviv: fix NULL check befo= re some freeing functions is not needed) Merging regmap/for-next (ccac12acc0c0 Merge remote-tracking branch 'regmap/= for-5.13' into regmap-next) Merging sound/for-next (bd15b15523fd ALSA: hda/realtek: Enable mute/micmute= LEDs and limit mic boost on EliteBook 845 G8) Merging sound-asoc/for-next (80e0ab429149 Merge remote-tracking branch 'aso= c/for-5.13' into asoc-next) Merging modules/modules-next (33121347fb1c module: treat exit sections the = same as init sections when !CONFIG_MODULE_UNLOAD) Merging input/next (aa2f62cf211a Input: add driver for the Hycon HY46XX tou= chpanel series) Merging block/for-next (2981e9778a70 Merge branch 'for-5.13/drivers' into f= or-next) Merging device-mapper/for-next (f99a8e4373ee dm raid: fix inconclusive resh= ape layout on fast raid4/5/6 table reload sequences) Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-b= ack function as reference formatting) Merging mmc/next (a9043467ed4f mmc: mmc_spi: Make of_mmc_spi.c resource pro= vider agnostic) Merging mfd/for-mfd-next (f9386c91574f mfd: intel-m10-bmc: Add support for = MAX10 BMC Secure Updates) Merging backlight/for-backlight-next (225be60f3853 dt-bindings: backlight: = qcom-wled: Add PMI8994 compatible) Merging battery/for-next (d0a43c12ee9f power: supply: cpcap-battery: fix in= valid usage of list cursor) Merging regulator/for-next (dcf0e405bba0 Merge remote-tracking branch 'regu= lator/for-5.13' into regulator-next) Merging security/next-testing (b0ccf48b958e Merge branch 'landlock_lsm_v33'= into next-testing) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.t= bl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.= tbl CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.t= bl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32= .tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64= .tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32= .tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/sysca= ll.tbl CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check) Merging integrity/next-integrity (28073eb09c5a ima: Fix fall-through warnin= gs for Clang) Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into th= e blacklist keyring) CONFLICT (content): Merge conflict in certs/system_keyring.c Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings= reported by test bot) Merging selinux/next (1fb057dcde11 smack: differentiate between subjective = and objective task credentials) Merging smack/next (7ef4c19d245f smackfs: restrict bytes count in smackfs w= rite functions) Merging tomoyo/master (5dc33592e955 lockdep: Allow tuning tracing capacity = constants.) Merging tpmdd/next (aec00aa04b11 KEYS: trusted: Fix missing null return fro= m kzalloc call) Merging watchdog/master (bf05bf16c76b Linux 5.12-rc8) Merging iommu/next (2d471b20c55e iommu: Streamline registration interface) Merging audit/next (b75d8f38bcc9 audit: drop /proc/PID/loginuid documentati= on Format field) Merging devicetree/for-next (aed4349c5d25 of: overlay: Fix kerneldoc warnin= g in of_overlay_remove()) CONFLICT (content): Merge conflict in drivers/of/of_net.c Merging mailbox/mailbox-for-next (93fb0c8df6d2 dt-bindings: mailbox: ti,sec= ure-proxy: Convert to json schema) Merging spi/for-next (037dc6160a83 Merge remote-tracking branch 'spi/for-5.= 13' into spi-next) Merging tip/auto-latest (c1d2a603724a Merge branch 'linus') Merging clockevents/timers/drivers/next (8120891105ba dt-bindings: timer: n= uvoton,npcm7xx: Add wpcm450-timer) Merging edac/edac-for-next (faf042d15093 Merge branch 'edac-amd64' into eda= c-for-next) Merging irqchip/irq/irqchip-next (94bc94209a66 irqchip/wpcm450: Drop COMPIL= E_TEST) CONFLICT (content): Merge conflict in drivers/irqchip/Makefile CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig Merging ftrace/for-next (e1db6338d6fa ftrace: Reuse the output of the funct= ion tracer for func_repeats) CONFLICT (content): Merge conflict in kernel/trace/bpf_trace.c CONFLICT (content): Merge conflict in arch/x86/kernel/kprobes/ftrace.c Merging rcu/rcu/next (bbc440a9296b rcu/tree_plugin: Don't handle the case o= f 'all' CPU range) $ git reset --hard HEAD^ Merging next-20210421 version of rcu Merging kvm/next (238eca821cee KVM: SVM: Allocate SEV command structures on= local stack) CONFLICT (content): Merge conflict in arch/x86/kvm/svm/nested.c CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c CONFLICT (modify/delete): arch/mips/kvm/trap_emul.c deleted in HEAD and mod= ified in kvm/next. Version kvm/next of arch/mips/kvm/trap_emul.c left in tr= ee. CONFLICT (content): Merge conflict in Documentation/virt/kvm/api.rst $ git rm -f arch/mips/kvm/trap_emul.c Merging kvm-arm/next (4085ae809334 Merge branch 'kvm-arm64/ptp' into kvmarm= -master/next) CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h CONFLICT (content): Merge conflict in Documentation/virt/kvm/api.rst Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host ra= dix SLB optimisation with hash guests) Merging kvms390/next (44bada282190 KVM: s390: fix guarded storage control r= egister handling) Merging xen-tip/linux-next (d120198bd5ff xen/evtchn: Change irq_info lock t= o raw_spinlock_t) Merging percpu/for-next (bd0d09ebd4f8 Merge branch 'for-5.12-fixes' into fo= r-next) Merging workqueues/for-next (89e28ce60cb6 workqueue/watchdog: Make unbound = workqueues aware of touch_softlockup_watchdog() 84;0;0c84;0;0c There are tw= o workqueue-specific watchdog timestamps:) Merging drivers-x86/for-next (37bd59d3cef8 platform/x86: intel_pmc_core: Un= initialized data in pmc_core_lpm_latch_mode_write()) CONFLICT (content): Merge conflict in drivers/platform/x86/thinkpad_acpi.c CONFLICT (content): Merge conflict in drivers/platform/x86/intel_pmc_core.c CONFLICT (content): Merge conflict in MAINTAINERS Merging chrome-platform/for-next (c6e939c63c80 platform/chrome: cros_ec_typ= ec: fix clang -Wformat warning) Merging hsi/for-next (5c08b0f75575 HSI: core: fix resource leaks in hsi_add= _client_from_dt()) Merging leds/for-next (d9dfac5419d0 leds: rt4505: Add support for Richtek R= T4505 flash LED controller) Merging ipmi/for-next (07cbd87b0416 ipmi_si: Join string literals back) Merging driver-core/driver-core-next (bd2a895f21eb PM / wakeup: use dev_set= _name() directly) CONFLICT (content): Merge conflict in drivers/of/property.c Merging usb/usb-next (4b853c236c7b usb: xhci-mtk: remove unused members) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (039b81d50a48 USB: cdc-acm: add more Maxlinear/= Exar models to ignore list) Merging usb-chipidea-next/for-usb-next (10076de33b5e usb: cdnsp: Fixes issu= e with Configure Endpoint command) Merging tty/tty-next (f9f54983005c serial: sh-sci: remove obsolete latency = workaround) Merging char-misc/char-misc-next (9204ff948684 coresight: etm-perf: Fix def= ine build issue when built as module) CONFLICT (content): Merge conflict in drivers/phy/qualcomm/phy-qcom-qmp.c Merging extcon/extcon-next (7b1222b224af extcon: qcom-spmi: Add support for= VBUS detection) Merging phy-next/next (8a6b85b14f08 phy: Revert "phy: ti: j721e-wiz: add mi= ssing of_node_put") Merging soundwire/next (14968dd36a50 soundwire: intel_init: test link->cdns) Merging thunderbolt/next (6f3badead6a0 thunderbolt: Hide authorized attribu= te if router does not support PCIe tunnels) Merging vfio/next (43dcf6ccf895 vfio/iommu_type1: Remove unused pinned_page= _dirty_scope in vfio_iommu) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/gvt.c Merging staging/staging-next (71d3edc61e29 staging: rtl8723bs: Remove led_b= link_hdl() and everything related) CONFLICT (content): Merge conflict in drivers/iio/common/scmi_sensors/scmi_= iio.c Applying: iio: adc: merge fix for "spi: core: remove 'delay_usecs' field fr= om spi_transfer" Merging iio/togreg (6470a8206a10 Merge tag 'iio-for-5.13b-take2' of https:/= /git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.ker= nel.org/pub/scm/linux/kernel/git/s390/linux) Merging icc/icc-next (c1de07884f2b Merge branch 'icc-sm8350' into icc-next) Merging dmaengine/next (435b512dbc0d dmaengine: idxd: remove detection of d= evice type) Merging cgroup/for-next (ffeee417d97f cgroup: use tsk->in_iowait instead of= delayacct_is_task_waiting_on_io()) CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.h CONFLICT (content): Merge conflict in arch/x86/kvm/svm/sev.c Applying: fixup for "KVM: SVM: Do not set sev->es_active until KVM_SEV_ES_I= NIT completes" Merging scsi/for-next (755e78ccbb07 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (85367040511f scsi: blk-mq: Fix build warning whe= n making htmldocs) Merging vhost/linux-next (89d54fb5f508 virtio-balloon: fix a typo in commen= t of virtballoon_migratepage()) Merging rpmsg/for-next (dc0e14fa833b Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-ex= isting file) Merging gpio-brgl/gpio/for-next (4ce8eb9c39f5 dt-bindings: gpio: add YAML d= escription for rockchip,gpio-bank) Merging gpio-intel/for-next (058459043e71 gpio: ich: Switch to be dependent= on LPC_ICH) Merging pinctrl/for-next (1f9da868b04e Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (5b613df3f499 pinctrl: intel: No need to dis= able IRQs in the handler) Merging pinctrl-renesas/renesas-pinctrl (61232cd6efca pinctrl: renesas: r8a= 7791: Add bias pinconf support) Merging pinctrl-samsung/for-next (a38fd8748464 Linux 5.12-rc2) Merging pwm/for-next (64d7d074acd5 pwm: lpss: Don't modify HW state in .rem= ove callback) Merging userns/for-next (95ebabde382c capabilities: Don't allow writing amb= iguous 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 bu= ilds) Merging kselftest/next (e75074781f17 selftests/resctrl: Change a few printe= d messages) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with= tv_nsec >=3D NSEC_PER_SEC") Merging livepatching/for-next (c150bbbb1731 Merge branch 'for-5.13/signal' = into for-next) Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the v= ariable =E2=80=9Ccs_fwnode=E2=80=9D in cti_plat_create_connection()) Merging rtc/rtc-next (9b9310445f5a rtc: ds1511: remove unused function) Merging nvdimm/libnvdimm-for-next (30c10d32152d Merge branch 'for-5.12/cxl'= into libnvdimm-for-next) Merging at24/at24/for-next (fe07bfda2fb9 Linux 5.12-rc1) Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) Merging seccomp/for-next/seccomp (a3fc712c5b37 seccomp: Fix "cacheable" typ= o in comments) Merging kspp/for-next/kspp (f4648c741299 Merge branch 'for-next/overflow' i= nto for-next/kspp) 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 resposibl= e -> responsible in slimbus.h) CONFLICT (content): Merge conflict in drivers/nvmem/Makefile CONFLICT (content): Merge conflict in drivers/nvmem/Kconfig Merging nvmem/for-next (e8405ad55f4c nvmem: sprd: Add missing MODULE_DEVICE= _TABLE) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from id= r_find_test_1) Merging hyperv/hyperv-next (753ed9c95c37 drivers: hv: Create a consistent p= attern for checking Hyper-V hypercall status) CONFLICT (content): Merge conflict in arch/x86/include/asm/mshyperv.h Applying: fix up for "x86/paravirt: Switch time pvops functions to use stat= ic_call()" Merging auxdisplay/auxdisplay (701454bce906 auxdisplay: Remove in_interrupt= () usage.) Merging kgdb/kgdb/for-next (83fa2d13d628 kdb: Refactor env variables get/se= t code) Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) Merging fpga/for-next (a78a51a851ed fpga: dfl: pci: add DID for D5005 PAC c= ards) Merging kunit/test (a38fd8748464 Linux 5.12-rc2) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and d= evm_ioremap_nocache) Merging cfi/cfi/next (f3907773d602 mtd: cfi_cmdset_0002: remove redundant a= ssignment to variable timeo) Merging kunit-next/kunit (de2fcb3e6201 Documentation: kunit: add tips for u= sing current->kunit_test) Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://g= it.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) Merging mhi/mhi-next (a503d1628c9c bus: mhi: fix typo in comments for struc= t mhi_channel_config) Merging memblock/for-next (097d43d85704 mm: memblock: remove return value o= f 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 (ac8b8400620a mm: unexpor= t follow_pfn) Merging rust/rust-next (47ff3585216b kbuild: dummy-tools: Add elfedit.) 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 (e49d033bddf5 Linux 5.12-rc6) Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' = into tpmdd-for-next) Merging akpm-current/current (e39fb2c85c3f ipc/sem.c: mundane typo fixes) CONFLICT (content): Merge conflict in mm/slub.c CONFLICT (content): Merge conflict in lib/test_kasan.c CONFLICT (content): Merge conflict in include/linux/bitmap.h CONFLICT (content): Merge conflict in block/blk-settings.c CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c CONFLICT (content): Merge conflict in arch/arm64/Kconfig CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-para= meters.txt $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (4cd4ba9e5ad4 memfd_secret: use unsigned int rather tha= n long as syscall flags type) --Sig_/RRLmoOIyqTU1zFtzSU+YMKD Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmCBRlIACgkQAVBC80lX 0Gyg+gf/XVRV83TL7MeM2cHcM4iJHNTQcMrQZz83syI/AI7BLrBW3wh/1jN/+pmW 9H56nTwqJSB1lo186GKpCfIpRGqe40ghmUyVQ0AXQ8GjS+55Lkoujy1s9H4HvVYD yc60NXcgBn1YuD6IYHtxvVH6PWatjlqqVOyPmHl5+1cUt33Xd89xMrMrESqhN2yP eRRldzN/b2OjpwJOmat0d4d6uU08VYe89cYHdeXbdhfsTc4MJR6v7Dd9H95KBrYx Q74B9UTQ8A9QIzEgG9igjrHq/eaP3OGyEAFPiXKK1r6b9bm6C4RMGokwTRHu7hfF EgjGgMLroPozCHpekW2Kf8a+ViyuNw== =YCdp -----END PGP SIGNATURE----- --Sig_/RRLmoOIyqTU1zFtzSU+YMKD--