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,URIBL_BLOCKED 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 39859C2B9F4 for ; Mon, 28 Jun 2021 10:57:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 18210619F1 for ; Mon, 28 Jun 2021 10:57:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232740AbhF1LAD (ORCPT ); Mon, 28 Jun 2021 07:00:03 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:33623 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232614AbhF1LAD (ORCPT ); Mon, 28 Jun 2021 07:00:03 -0400 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 4GD4M15YySz9sV8; Mon, 28 Jun 2021 20:57:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1624877853; bh=4YiqF5ZLEvlHRYKz1hHIrGe1DaPsRccC6ONl6C0e0NU=; h=Date:From:To:Cc:Subject:From; b=IJ9PSi74TIxF6VNdyyRSOLaaQMzGXYdsngFU3kXmfQ+QWZiyNTELJ24ZoMSZ9rJvC +9Z/ewSUweS4btDwnslsfIlcsMaxvpPQoHsRSuNd9eZ2bRSMgf1U8LQ/9P37Nq/Y1d 9op3yqxEvD1t7XZ22axwfpyU/E9qrD06bBX2rjlbBWSiX7Iln33B3q3GSlKw6l41sZ 5kRUbbs+i3yxLKER4cHtlUZi8ZlYjgVYLXOrJ889eCeKG9dGDpkXv4IhTEmyy71Rsi EEuGP5BK1cogLXw6Ft9EDXZMlQObeVYzK7bHevNNmAJVEgNsWBaFPg5+/usW9ryewp 8a9tSsi2uSajw== Date: Mon, 28 Jun 2021 20:57:32 +1000 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jun 28 Message-ID: <20210628205732.4c2a0abf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/CIOcg5NsgTv5DiL5Wx7TW_1"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/CIOcg5NsgTv5DiL5Wx7TW_1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20210625: The kunit-fixes tree lost its build failures. The net-next lost its modules_install failure. The tip tree gained a build failure so I used the version from next-20210625. The akpm tree gained a conflict against the powerpc tree. Non-merge commits (relative to Linus' tree): 12631 11601 files changed, 761984 insertions(+), 341091 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. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (b4b27b9eed8e Revert "signal: Allow tasks to cache on= e sigqueue struct") Merging fixes/fixes (614124bea77e Linux 5.13-rc5) Merging kbuild-current/fixes (c4681547bcce Linux 5.13-rc3) Merging arc-current/for-curr (13311e74253f Linux 5.13-rc7) Merging arm-current/fixes (dad7b9896a5d ARM: 9081/1: fix gcc-10 thumb2-kern= el regression) Merging arm64-fixes/for-next/fixes (e69012400b0c arm64: mm: don't use CON a= nd BLK mapping if KFENCE is enabled) Merging arm-soc-fixes/arm/fixes (048c958f12a2 Merge tag 'tee-reviewer-for-v= 5.13' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/fix= es) Merging drivers-memory-fixes/fixes (6efb943b8616 Linux 5.13-rc1) Merging m68k-current/for-linus (34e5269bf987 m68k: sun3x: Remove unneeded s= emicolon) Merging powerpc-fixes/fixes (60b7ed54a41b powerpc/perf: Fix crash in perf_i= nstruction_pointer() when ppmu is not set) Merging s390-fixes/fixes (67147e96a332 s390/stack: fix possible register co= rruption with stack switch helper) 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 (d6765985a42a Revert "be2net: disable bh with spin_lock = in be_process_mcc") Merging bpf/master (3db6735f2ef4 bpf, x86: Fix extable offset calculation) Merging ipsec/master (dd72fadf2186 xfrm: Fix xfrm offload fallback fail cas= e) Merging netfilter/master (f4b29d2ee903 Merge git://git.kernel.org/pub/scm/l= inux/kernel/git/pablo/nf) Merging ipvs/master (f4cdcae03f9c Merge branch 'cxgb4-fixes') Merging wireless-drivers/master (1f9482aa8d41 mwifiex: bring down link befo= re deleting interface) Merging mac80211/master (f4b29d2ee903 Merge git://git.kernel.org/pub/scm/li= nux/kernel/git/pablo/nf) Merging rdma-fixes/for-rc (13311e74253f Linux 5.13-rc7) Merging sound-current/for-linus (5c6d4f97267f MAINTAINERS: remove Timur Tab= i from Freescale SOC sound drivers) Merging sound-asoc-fixes/for-linus (c073a58a7ec5 Merge remote-tracking bran= ch 'asoc/for-5.13' into asoc-linus) Merging regmap-fixes/for-linus (614124bea77e Linux 5.13-rc5) Merging regulator-fixes/for-linus (ebad413c3cb0 Merge remote-tracking branc= h 'regulator/for-5.13' into regulator-linus) Merging spi-fixes/for-linus (edf978a5a17d Merge remote-tracking branch 'spi= /for-5.13' into spi-linus) Merging pci-current/for-linus (6efb943b8616 Linux 5.13-rc1) Merging driver-core.current/driver-core-linus (009c9aa5be65 Linux 5.13-rc6) Merging tty.current/tty-linus (009c9aa5be65 Linux 5.13-rc6) Merging usb.current/usb-linus (13311e74253f Linux 5.13-rc7) Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial-fixes/usb-linus (009c9aa5be65 Linux 5.13-rc6) Merging usb-chipidea-fixes/for-usb-fixes (c6d580d96f14 usb: chipidea: imx: = Fix Battery Charger 1.2 CDP detection) Merging phy/fixes (d1ce245fe409 phy: Sparx5 Eth SerDes: check return value = after calling platform_get_resource()) Merging staging.current/staging-linus (009c9aa5be65 Linux 5.13-rc6) Merging iio-fixes/fixes-togreg (e9de1ecadeab staging: ralink-gdma: Remove i= ncorrect author information) Merging char-misc.current/char-misc-linus (009c9aa5be65 Linux 5.13-rc6) Merging soundwire-fixes/fixes (da096fbccd52 soundwire: qcom: fix handling o= f qcom,ports-block-pack-mode) Merging thunderbolt-fixes/fixes (13311e74253f Linux 5.13-rc7) Merging input-current/for-linus (45a4b68354ff Input: elants_i2c - switch to= probe_new) Merging crypto-current/master (e3a606f2c544 fsverity: relax build time depe= ndency 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 ca= ll in error flow) Merging kselftest-fixes/fixes (d07f6ca923ea Linux 5.13-rc2) Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit se= ctions in layout_sections() instead of module_init_section()) Merging dmaengine-fixes/fixes (9041575348b2 dmaengine: mediatek: use GFP_NO= WAIT instead of GFP_ATOMIC in prep_dma) 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: Re= vert "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 FUN= CTION_GRAPH_TRACER and PREEMPT_TRACER) Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1) Merging omap-fixes/fixes (3ff340e24c9d bus: ti-sysc: Fix gpt12 system timer= issue with reserved status) Merging kvm-fixes/master (f8be156be163 KVM: do not allow mapping valid but = non-reference-counted pages) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KV= M/s390) Merging hwmon-fixes/hwmon (6e9ef8ca687e hwmon: (pmbus/bpa-rs600) Handle Vin= readings >=3D 256V) Merging nvdimm-fixes/libnvdimm-fixes (de80d5781136 Merge branch 'for-5.13/d= ax' into libnvdimm-fixes) Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity p= robing) Merging btrfs-fixes/next-fixes (9d7848127f97 Merge branch 'misc-5.13' into = next-fixes) Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra fil= e 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 (701b54bcb7d0 platform/mellanox: mlxreg-hot= plug: Revert "move to use request_irq by IRQF_NO_AUTOEN flag") 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 (8929ef8d4dfd media: dt-bindings: media: = renesas,drif: Fix fck definition) Merging scsi-fixes/fixes (d1b7f92035c6 scsi: sd: Call sd_revalidate_disk() = for ioctl(BLKRRPART)) Merging drm-fixes/drm-fixes (5e0e7a407675 Merge tag 'drm-misc-fixes-2021-06= -24' of git://anongit.freedesktop.org/drm/drm-misc 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 (97ece1dfb2eb drm/i915/display= : Do not zero past infoframes.vsc) Merging mmc-fixes/fixes (103a5348c22c mmc: meson-gx: use memcpy_to/fromio f= or dram-access-quirk) 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 (6efb943b8616 Linux 5.13-rc1) Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask thr= ough cpumask_of(cpu)) Merging risc-v-fixes/fixes (7ede12b01b59 riscv: dts: fu740: fix cache-contr= oller interrupts) 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 (009c9aa5be65 Linux 5.13-rc6) Merging gpio-brgl-fixes/gpio/for-current (c6414e1a2bd2 gpio: AMD8111 and TQ= MX86 require HAS_IOPORT_MAP) 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 pcluste= r for big pcluster) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_d= esc()) Merging kunit-fixes/kunit-fixes (1d71307a6f94 kunit: add unit test for filt= ering suites by names) 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 (9f4ad9e425a1 Linux 5.12) Merging drm-misc-fixes/for-linux-next-fixes (d33009911559 drm/nouveau: fix = dma_address check for CPU/GPU sync) Merging kspp-gustavo/for-next/kspp (a73bbfba991f media: siano: Fix out-of-b= ounds warnings in smscore_load_firmware_family2()) Merging kbuild/for-next (c7c90e121e99 kconfig.h: explain IS_MODULE(), IS_EN= ABLED()) Merging compiler-attributes/compiler-attributes (ca0760e7d79e Compiler Attr= ibutes: Add continue in comment) Merging dma-mapping/for-next (2b4bbc6231d7 dma-debug: report -EEXIST errors= in add_dma_entry) Merging asm-generic/master (14462376858e Merge branch 'asm-generic-unaligne= d' into asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (2ac9912d2041 Merge branches 'fixes' and 'misc' into f= or-next) Merging arm64/for-next/core (3d1bf78c7b13 Merge branch 'for-next/sve' into = for-next/core) CONFLICT (content): Merge conflict in arch/arm64/kernel/process.c Merging arm-perf/for-next/perf (d96b1b8c9f79 drivers/perf: fix the missed i= da_simple_remove() in ddr_perf_probe()) Merging arm-soc/for-next (2ded36511b58 ARM: Document merges) Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add = ATC2603C PMIC) Merging amlogic/for-next (b03485fe99f2 Merge tags 'amlogic-arm64-dt-for-v5.= 14-v2' and 'amlogic-arm-dt-for-v5.14' into for-next) Merging aspeed/for-next (cd946cfe2e7e Merge branches 'defconfig-for-v5.14' = and 'dt-for-v5.14' into for-next) Merging at91/at91-next (80cbaa6d3450 Merge branches 'at91-dt' and 'at91-def= config' into at91-next) Merging drivers-memory/for-next (316ce128fbbe Merge branch 'for-v5.14/tegra= -mc-late-or-fixes' into for-next) Merging imx-mxs/for-next (5004b2d18827 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 (a1c8c49de3d7 Merge branch 'v5.13-next/soc' into = for-next) Merging mvebu/for-next (72a0a49b7c77 Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (91ee322340fb Merge branch 'omap-for-v5.14/dt' into f= or-next) Merging qcom/for-next (c275bbc84be9 Merge branches 'arm64-defconfig-for-5.1= 4', 'arm64-for-5.14', 'drivers-for-5.14' and 'dts-for-5.14' into for-next) Merging raspberrypi/for-next (21c6bf8304f0 arm64: dts: broadcom: Add refere= nce to RPi 400) Merging renesas/next (23df6d1f0971 Merge branches 'renesas-arm-defconfig-fo= r-v5.14', 'renesas-arm-dt-for-v5.14', 'renesas-drivers-for-v5.14' and 'rene= sas-dt-bindings-for-v5.14' into renesas-next) Merging reset/reset/next (48a74b1147f7 reset: Add compile-test stubs) Merging rockchip/for-next (764f25388c38 Merge branch 'v5.14-clk/next' into = for-next) Merging samsung-krzk/for-next (5ce16705e00d Merge branch 'next/defconfig' i= nto for-next) Merging scmi/for-linux-next (0a169e13c00d Merge tag 'arm-ffa-5.14-2' of git= ://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linu= x-next) Merging stm32/stm32-next (4bf4abe19089 ARM: dts: stm32: fix stpmic node for= stm32mp1 boards) Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.1= 4' and 'sunxi/fixes-for-5.13' into sunxi/for-next) Merging tegra/for-next (eac9ab885bb5 Merge branch for-5.14/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 (d71abfcc6c05 arm64: dts: ti: k3-am642-evm/sk:= Add DDR carveout memory nodes for R5Fs) Merging xilinx/for-next (d98fb9ab6255 Merge branch 'zynq/dt' into for-next) Merging clk/clk-next (0eb0a122fa4d Merge branch 'clk-amlogic' into clk-next) Merging clk-imx/for-next (c586f53ae159 clk: imx8mq: remove SYS PLL 1/2 cloc= k gates) Merging clk-renesas/renesas-clk (2cd1e3883a57 clk: renesas: rzg2l: Fix off-= by-one check in rzg2l_cpg_clk_src_twocell_get()) 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 (c1367ee016e3 m68k: atari: Fix ATARI_KBD_CORE kconfig= unmet dependency warning) Merging m68knommu/for-next (3f605ee17f8e m68knommu: fix missing LCD splash = screen data initializer) Merging microblaze/next (14a832498c23 arch: microblaze: Fix spelling mistak= e "vesion" -> "version") Merging mips/mips-next (a2cdc24e2057 mips/kvm: Use BUG_ON instead of if con= dition followed by BUG) 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 (ad4e600cbf89 drivers/soc/litex: remove 8-bit sub= register option) Merging parisc-hd/for-next (9f4ad9e425a1 Linux 5.12) Merging powerpc/next (b064037ea410 powerpc/interrupt: Use names in check_re= turn_regs_valid()) Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM dr= iver) Merging risc-v/for-next (01d13185f183 riscv: add ASID-based tlbflushing met= hods) CONFLICT (content): Merge conflict in arch/riscv/Kconfig Merging s390/for-next (6de0091b9278 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 (1aee020155f3 um: remove unneeded semicolon in um_ar= ch.c) Merging xtensa/xtensa-for-next (21e0c3d5f633 xtensa: fix kconfig unmet depe= ndency warning for HAVE_FUTEX_CMPXCHG) Merging pidfd/for-next (5ddf9602d711 Merge branch 'fs.mount_setattr.nosymfo= llow' into for-next) Merging fscrypt/master (2fc2b430f559 fscrypt: fix derivation of SipHash key= s on big endian CPUs) Merging fscache/fscache-next (18d5803bc50e fscache: Use refcount_t for the = cookie refcount instead of atomic_t) Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build= ") Merging btrfs/for-next (808c6838dfee Merge branch 'for-next-current-v5.12-2= 0210624' into for-next-20210624) Merging ceph/master (bbd77dc78e21 libceph: fix doc warnings in cls_lock_cli= ent.c) Merging cifs/for-next (0fa757b5d3ea smb3: prevent races updating CurrentMid) Merging cifsd/cifsd-for-next (be8bcf8baaec Merge pull request #55 from namj= aejeon/cifsd-for-next) Merging configfs/for-next (c886fa3cf6ff configfs: simplify configfs_release= _bin_file) Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' o= f git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs) Merging erofs/dev (8215d5b7f15f MAINTAINERS: erofs: update my email address) Merging exfat/dev (5264f724cf1f exfat: handle wrong stream entry size in ex= fat_readdir()) Merging ext3/for_next (7d7204936dd9 Merge tag 'hole_punch_fixes_for_5.14-rc= 1' into for_next) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h Merging ext4/dev (f9505c72b2ee ext4: use local variable ei instead of EXT4_= I() macro) Merging f2fs/dev (4effcf27f123 f2fs: remove false alarm on iget failure dur= ing GC) Applying: fix up for "f2fs: Convert to using invalidate_lock" Merging fsverity/fsverity (07c99001312c fs-verity: support reading signatur= e with ioctl) Merging fuse/for-next (c4e0cd4e0c16 virtiofs: Fix spelling mistakes) Merging gfs2/for-next (4304d3be8754 gfs2: Fix underflow in gfs2_page_mkwrit= e) Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy()) Merging nfs/linux-next (b260b06fc086 Merge branch 'sysfs-devel') Merging nfs-anna/linux-next (4f8be1f53bf6 nfs: we don't support removing sy= stem.nfs4_acl) Merging nfsd/nfsd-next (353e1e2a7f22 NFSD: Prevent a possible oops in the n= fs_dirent() tracepoint) Merging cel/for-next (b9f83ffaa0c0 SUNRPC: Fix null pointer dereference in = svc_rqst_free()) Merging orangefs/for-next (1815bba0a5c9 orangefs: fix orangefs df output.) Merging overlayfs/overlayfs-next (5e717c6fa41f ovl: add debug print to ovl_= do_getxattr()) Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock f= or whiteout inode) Merging v9fs/9p-next (cba7dcd8878e 9p/trans_virtio: Remove sysfs file on pr= obe failure) Merging xfs/for-next (1effb72a8179 xfs: don't wait on future iclogs when pu= shing the CIL) Merging zonefs/for-next (6980d29ce4da zonefs: fix to update .i_wr_refcnt co= rrectly in zonefs_open_zone()) Merging iomap/iomap-for-next (6e552494fb90 iomap: remove unused private fie= ld 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 assign= ment in fcntl_getlk) Merging vfs/for-next (1130294f1440 Merge branch 'work.iov_iter' into for-ne= xt) Merging printk/for-next (48e72544d6f0 Merge branch 'printk-rework' into for= -next) Merging pci/next (6a69c06e0e25 Merge branch 'remotes/lorenzo/pci/xgene') Merging pstore/for-next/pstore (1d1f6cc5818c pstore/blk: Include zone in ps= tore_device_info) Merging hid/for-next (f3fb2deb517f Merge branch 'for-5.13/upstream-fixes' i= nto for-next) Merging i2c/i2c/for-next (31bc56c0138c Merge branch 'i2c/for-mergewindow' i= nto i2c/for-next) Merging i3c/i3c/next (3e5feb11a829 i3c: master: svc: fix doc warning in svc= -i3c-master.c) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has= moved) Merging hwmon-staging/hwmon-next (a5f6c0f85a09 hwmon: Support set_trips() o= f thermal device ops) Merging jc_docs/docs-next (98cf4951842a Merge branch 'path-lookup' into doc= s-next) Merging v4l-dvb/master (50e7a31d30e8 media: Fix Media Controller API config= checks) Merging v4l-dvb-next/master (50e7a31d30e8 media: Fix Media Controller API c= onfig checks) Merging pm/linux-next (33842e66a789 Merge branch 'pm-devfreq' into linux-ne= xt) Merging cpufreq-arm/cpufreq/arm/linux-next (3a43a0d955d6 Merge branch 'cpuf= req/cppc' into cpufreq/arm/linux-next) Merging cpupower/cpupower (d07f6ca923ea Linux 5.13-rc2) Merging devfreq/devfreq-next (8c37d01e1a86 PM / devfreq: passive: Fix get_t= arget_freq when not using required-opp) Merging opp/opp/linux-next (4fa82a87ba55 opp: Allow required-opps to be use= d for non genpd use cases) Merging thermal/thermal/linux-next (92a926806ce1 thermal/drives/int340x/pro= cessor_thermal: Add PCI MMIO based thermal driver) Merging dlm/next (957adb68b3f7 fs: dlm: invalid buffer access in lookup err= or) Merging swiotlb/linux-next (b655006619b7 of: Add plumbing for restricted DM= A pool) Merging rdma/for-next (1f700757224e RDMA/irdma: Fix potential overflow expr= ession in irdma_prm_get_pbles) Merging net-next/master (ff8744b5eb11 Merge branch '100GbE' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/tnguy/next-queue) CONFLICT (content): Merge conflict in net/sctp/input.c CONFLICT (content): Merge conflict in net/netfilter/nf_tables_api.c CONFLICT (content): Merge conflict in net/ipv4/udp_bpf.c CONFLICT (content): Merge conflict in net/ipv4/tcp_bpf.c CONFLICT (content): Merge conflict in net/core/skmsg.c CONFLICT (content): Merge conflict in include/linux/skmsg.h CONFLICT (content): Merge conflict in Documentation/networking/devlink/devl= ink-trap.rst Merging bpf-next/for-next (a196fa78a265 bpfilter: Specify the log level for= the kmsg message) Merging ipsec-next/master (b5a1d1fe0cbb xfrm: replay: remove last replay in= direction) Merging mlx5-next/mlx5-next (9a1ac95a59d0 RDMA/mlx5: Refactor get_ts_format= functions to simplify code) Merging netfilter-next/master (a2f7dc00ea51 virtio_net: Use virtio_find_vqs= _ctx() helper) Merging ipvs-next/master (a212d9f33ed0 Merge branch 'iosm-driver') Merging wireless-drivers-next/master (ff8744b5eb11 Merge branch '100GbE' of= git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) Merging bluetooth/master (1f0536139cb8 Bluetooth: hci_uart: Remove redundan= t assignment to fw_ptr) Merging mac80211-next/master (2433647bc8d9 mac80211: Switch to a virtual ti= me-based airtime scheduler) Merging mtd/mtd/next (6aa12138cd9a mtd: Convert list_for_each to entry vari= ant) Merging nand/nand/next (c06dd49fd59a mtd: rawnand: omap: Add larger page NA= ND chips support) Merging spi-nor/spi-nor/next (c17e5c85b32f mtd: spi-nor: remove redundant c= ontinue statement) Merging crypto/master (9f38b678ffc4 crypto: sl3516 - depends on HAS_IOMEM) CONFLICT (content): Merge conflict in drivers/crypto/cavium/nitrox/nitrox_m= ain.c Merging drm/drm-next (b322a50d17ed Merge tag 'amd-drm-next-5.14-2021-06-22-= 1' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c Merging drm-misc/for-linux-next (eed75ce7c826 drm/amdgpu: fix amdgpu_preemp= t_mgr_new()) Merging amdgpu/drm-next (464c4e66f99b PCI: quirks: Quirk PCI d3hot delay fo= r AMD xhci) Merging drm-intel/for-linux-next (1bd8a7dc28c1 Merge tag 'exynos-drm-next-f= or-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exyn= os into drm-next) Merging drm-tegra/drm/tegra/for-next (a562c0783b5f drm/tegra: Don't call SE= T_APPLICATION_ID in VIC boot) Merging drm-msm/msm-next (e88bbc91849b Revert "drm/msm/mdp5: provide dynami= c bandwidth management") Merging imx-drm/imx-drm/next (fc1e985b67f9 drm/imx: ipuv3-plane: add color = encoding and range properties) Merging etnaviv/etnaviv/next (989c9dad6131 drm/etnaviv: add HWDB entry for = GC7000 rev 6204) Merging regmap/for-next (d17032f2befa Merge remote-tracking branch 'regmap/= for-5.14' into regmap-next) Merging sound/for-next (0cbbeaf37022 ALSA: firewire-lib: Fix 'amdtp_domain_= start()' when no AMDTP_OUT_STREAM stream is found) Merging sound-asoc/for-next (192664528154 Merge remote-tracking branch 'aso= c/for-5.14' into asoc-next) Merging modules/modules-next (2c0f0f363956 module: correctly exit module_ka= llsyms_on_each_symbol when fn() !=3D 0) Merging input/next (cac7100d4c51 Input: hideep - fix the uninitialized use = in hideep_nvm_unlock()) Merging block/for-next (91913cfc85ee Merge branch 'for-5.14/block' into for= -next) CONFLICT (modify/delete): include/linux/ide.h deleted in block/for-next and= modified in HEAD. Version HEAD of include/linux/ide.h left in tree. CONFLICT (modify/delete): drivers/ide/via82cxxx.c deleted in block/for-next= and modified in HEAD. Version HEAD of drivers/ide/via82cxxx.c left in tree. CONFLICT (modify/delete): drivers/ide/triflex.c deleted in block/for-next a= nd modified in HEAD. Version HEAD of drivers/ide/triflex.c left in tree. CONFLICT (modify/delete): drivers/ide/slc90e66.c deleted in block/for-next = and modified in HEAD. Version HEAD of drivers/ide/slc90e66.c left in tree. CONFLICT (modify/delete): drivers/ide/sl82c105.c deleted in block/for-next = and modified in HEAD. Version HEAD of drivers/ide/sl82c105.c left in tree. CONFLICT (modify/delete): drivers/ide/sis5513.c deleted in block/for-next a= nd modified in HEAD. Version HEAD of drivers/ide/sis5513.c left in tree. CONFLICT (modify/delete): drivers/ide/siimage.c deleted in block/for-next a= nd modified in HEAD. Version HEAD of drivers/ide/siimage.c left in tree. CONFLICT (modify/delete): drivers/ide/setup-pci.c deleted in block/for-next= and modified in HEAD. Version HEAD of drivers/ide/setup-pci.c left in tree. CONFLICT (modify/delete): drivers/ide/serverworks.c deleted in block/for-ne= xt and modified in HEAD. Version HEAD of drivers/ide/serverworks.c left in = tree. CONFLICT (modify/delete): drivers/ide/sc1200.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/sc1200.c left in tree. CONFLICT (modify/delete): drivers/ide/piix.c deleted in block/for-next and = modified in HEAD. Version HEAD of drivers/ide/piix.c left in tree. CONFLICT (modify/delete): drivers/ide/pdc202xx_old.c deleted in block/for-n= ext and modified in HEAD. Version HEAD of drivers/ide/pdc202xx_old.c left i= n tree. CONFLICT (modify/delete): drivers/ide/pdc202xx_new.c deleted in block/for-n= ext and modified in HEAD. Version HEAD of drivers/ide/pdc202xx_new.c left i= n tree. CONFLICT (modify/delete): drivers/ide/opti621.c deleted in block/for-next a= nd modified in HEAD. Version HEAD of drivers/ide/opti621.c left in tree. CONFLICT (modify/delete): drivers/ide/ns87415.c deleted in block/for-next a= nd modified in HEAD. Version HEAD of drivers/ide/ns87415.c left in tree. CONFLICT (modify/delete): drivers/ide/jmicron.c deleted in block/for-next a= nd modified in HEAD. Version HEAD of drivers/ide/jmicron.c left in tree. CONFLICT (modify/delete): drivers/ide/it821x.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/it821x.c left in tree. CONFLICT (modify/delete): drivers/ide/it8213.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/it8213.c left in tree. CONFLICT (modify/delete): drivers/ide/it8172.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/it8172.c left in tree. CONFLICT (modify/delete): drivers/ide/ide-pci-generic.c deleted in block/fo= r-next and modified in HEAD. Version HEAD of drivers/ide/ide-pci-generic.c = left in tree. CONFLICT (modify/delete): drivers/ide/ide-acpi.c deleted in block/for-next = and modified in HEAD. Version HEAD of drivers/ide/ide-acpi.c left in tree. CONFLICT (modify/delete): drivers/ide/hpt366.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/hpt366.c left in tree. CONFLICT (modify/delete): drivers/ide/delkin_cb.c deleted in block/for-next= and modified in HEAD. Version HEAD of drivers/ide/delkin_cb.c left in tree. CONFLICT (modify/delete): drivers/ide/cy82c693.c deleted in block/for-next = and modified in HEAD. Version HEAD of drivers/ide/cy82c693.c left in tree. CONFLICT (modify/delete): drivers/ide/cs5536.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/cs5536.c left in tree. CONFLICT (modify/delete): drivers/ide/cs5535.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/cs5535.c left in tree. CONFLICT (modify/delete): drivers/ide/cs5530.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/cs5530.c left in tree. CONFLICT (modify/delete): drivers/ide/cs5520.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/cs5520.c left in tree. CONFLICT (modify/delete): drivers/ide/cmd64x.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/cmd64x.c left in tree. CONFLICT (modify/delete): drivers/ide/atiixp.c deleted in block/for-next an= d modified in HEAD. Version HEAD of drivers/ide/atiixp.c left in tree. CONFLICT (modify/delete): drivers/ide/amd74xx.c deleted in block/for-next a= nd modified in HEAD. Version HEAD of drivers/ide/amd74xx.c left in tree. CONFLICT (modify/delete): drivers/ide/alim15x3.c deleted in block/for-next = and modified in HEAD. Version HEAD of drivers/ide/alim15x3.c left in tree. CONFLICT (modify/delete): drivers/ide/aec62xx.c deleted in block/for-next a= nd modified in HEAD. Version HEAD of drivers/ide/aec62xx.c left in tree. CONFLICT (modify/delete): drivers/ide/Kconfig deleted in block/for-next and= modified in HEAD. Version HEAD of drivers/ide/Kconfig left in tree. $ git rm -f drivers/ide/Kconfig drivers/ide/aec62xx.c drivers/ide/alim15x3.= c drivers/ide/amd74xx.c drivers/ide/atiixp.c drivers/ide/cmd64x.c drivers/i= de/cs5520.c drivers/ide/cs5530.c drivers/ide/cs5535.c drivers/ide/cs5536.c = drivers/ide/cy82c693.c drivers/ide/delkin_cb.c drivers/ide/hpt366.c drivers= /ide/ide-acpi.c drivers/ide/ide-pci-generic.c drivers/ide/it8172.c drivers/= ide/it8213.c drivers/ide/it821x.c drivers/ide/jmicron.c drivers/ide/ns87415= .c drivers/ide/opti621.c drivers/ide/pdc202xx_new.c drivers/ide/pdc202xx_ol= d.c drivers/ide/piix.c drivers/ide/sc1200.c drivers/ide/serverworks.c drive= rs/ide/setup-pci.c drivers/ide/siimage.c drivers/ide/sis5513.c drivers/ide/= sl82c105.c drivers/ide/slc90e66.c drivers/ide/triflex.c drivers/ide/via82cx= xx.c include/linux/ide.h Merging device-mapper/for-next (95b88f4d71cb dm writecache: pause writeback= if cache full and origin being written directly) Merging pcmcia/pcmcia-next (e9d503fef7da pcmcia: rsrc_nonstatic: Fix call-b= ack function as reference formatting) Merging mmc/next (98b5ce4c08ca mmc: sdhci-iproc: Add support for the legacy= sdhci controller on the BCM7211) Merging mfd/for-mfd-next (495fb48dbd9b mfd: wm831x: Use DEFINE_RES_IRQ_NAME= D() and DEFINE_RES_IRQ() to simplify code) Merging backlight/for-backlight-next (6fc632d3e3e0 video: backlight: qcom-w= led: Add PMI8994 compatible) Merging battery/for-next (eab4e6d953c1 power: supply: cpcap-charger: get th= e battery inserted infomation from cpcap-battery) Merging regulator/for-next (7fb593cbd88c Merge remote-tracking branch 'regu= lator/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 (907a399de7b0 evm: Check xattr size discre= pancy between kernel and user) 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 (1b8b71922919 LSM: SafeSetID: Mark safeset= id_initialized as __initdata) Merging selinux/next (d99cf13f1420 selinux: kill 'flags' argument in avc_ha= s_perm_flags() and avc_audit()) Merging smack/next (fe6bde732be8 Smack: fix doc warning) Merging tomoyo/master (98eaa63e9627 tomoyo: fix doc warnings) Merging tpmdd/next (87e968848116 certs: Add support for using elliptic curv= e keys for signing modules) Merging watchdog/master (cf813c67d961 watchdog: iTCO_wdt: use dev_err() ins= tead of pr_err()) Merging iommu/next (2b9d8e3e9a9b Merge branches 'iommu/fixes', 'arm/rockchi= p', 'arm/smmu', 'x86/vt-d', 'x86/amd', 'virtio' and 'core' into next) Merging audit/next (0ecc617858fc audit: remove unnecessary 'ret' initializa= tion) Merging devicetree/for-next (180208cedfec dt-bindings: crypto: ccree: Conve= rt to json-schema) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net= /stm32-dwmac.yaml CONFLICT (modify/delete): Documentation/devicetree/bindings/mtd/ti,am654-hb= mc.txt deleted in HEAD and modified in devicetree/for-next. Version devicet= ree/for-next of Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt lef= t in tree. CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/med= ia/renesas,drif.yaml CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/dis= play/bridge/cdns,mhdp8546.yaml $ git rm -f Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt Merging mailbox/mailbox-for-next (4f197188da66 MAINTAINERS: add entry for p= olarfire soc mailbox) Merging spi/for-next (1bee1ecf232c Merge remote-tracking branch 'spi/for-5.= 14' into spi-next) Merging tip/auto-latest (34f22feeb4d8 Merge branch 'timers/core') CONFLICT (content): Merge conflict in samples/kprobes/kprobe_example.c $ git reset --hard HEAD^ Merging next-20210625 version of tip CONFLICT (content): Merge conflict in samples/kprobes/kprobe_example.c [master d07a139361b6] next-20210625/tip Merging clockevents/timers/drivers/next (6f64c8159af9 clocksource/drivers/a= rm_global_timer: Remove duplicated argument in arm_global_timer) Merging edac/edac-for-next (0a9ece9ba154 EDAC/igen6: fix core dependency) Merging irqchip/irq/irqchip-next (c51e96dace68 Merge branch irq/irqchip-dri= ver-updates into irq/irqchip-next) Applying: powerpc: fix up for "Drop dependency between asm/irq.h and linux/= irqdomain.h" Merging ftrace/for-next (6a2cbc58d6c9 seq_buf: Make trace_seq_putmem_hex() = support data longer than 8) Merging rcu/rcu/next (90d348da28ab scftorture: Add RPC-like IPI tests) CONFLICT (content): Merge conflict in kernel/time/clocksource.c CONFLICT (content): Merge conflict in kernel/rcu/tree_stall.h CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h CONFLICT (content): Merge conflict in include/linux/rcupdate.h Applying: fix for code movement to kernel/rcu/tree_nocb.h Merging kvm/next (a01b45e9d34d KVM: x86: rename apic_access_page_done to ap= ic_access_memslot_enabled) Merging kvm-arm/next (188982cda00e Merge branch kvm-arm64/mmu/mte into kvma= rm-master/next) CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/include/x= 86_64/processor.h CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/Makefile CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/mte.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 (1f703d2cf204 KVM: s390: allow facility 192 (vector-pa= cked-decimal-enhancement facility 2)) Merging xen-tip/linux-next (3de218ff39b9 xen/events: reset active flag for = lateeoi events later) Merging percpu/for-next (5c28d6836dc7 Merge branch 'for-5.14' into for-next) Merging workqueues/for-next (f2ccd0a922b3 workqueue: Add back __printf form= at validation) Merging drivers-x86/for-next (71d69e82f416 platform/x86: think-lmi: Return = EINVAL when kbdlang gets set to a 0 length string) CONFLICT (content): Merge conflict in drivers/platform/surface/surface_aggr= egator_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 (7b97174cc93f leds: lgm: Fix up includes) Merging ipmi/for-next (5b32dd281ee0 ipmi: kcs_bmc_aspeed: Fix less than zer= o comparison of a unsigned int) Merging driver-core/driver-core-next (3b1f941536af docs: ABI: testing: sysf= s-firmware-memmap: add some memmap types.) Merging usb/usb-next (7756f1d6369e phy: qcom-qusb2: Add configuration for S= M4250 and SM6115) Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) Merging usb-serial/usb-next (8051334e901f USB: serial: cp210x: add support = for GPIOs on CP2108) Merging usb-chipidea-next/for-usb-next (956df1bb0ab8 usb: chipidea: host: f= ix port index underflow and UBSAN complains) Merging tty/tty-next (15279ebe99d7 serial: mvebu-uart: remove unused member= nb from struct mvebu_uart) Merging char-misc/char-misc-next (6f746d485fb9 mcb: Use DEFINE_RES_MEM() he= lper macro and fix the end address) CONFLICT (content): Merge conflict in include/linux/soundwire/sdw.h Merging extcon/extcon-next (d97c0ff5a124 extcon: sm5502: Add support for SM= 5504) Merging phy-next/next (15692a80d949 phy: Revert "phy: ralink: Kconfig: conv= ert mt7621-pci-phy into 'bool'") Merging soundwire/next (3d3e88e33633 soundwire: stream: Fix test for DP pre= pare complete) Merging thunderbolt/next (b18f901382fd thunderbolt: Fix DROM handling for U= SB4 DROM) Merging vfio/next (742b4c0d1efe vfio: use the new pci_dev_trylock() helper = to simplify try lock) Merging staging/staging-next (77ad1f0e99bd staging: hi6421-spmi-pmic: clean= up some macros) CONFLICT (content): Merge conflict in MAINTAINERS Merging iio/togreg (6cbb3aa0f9d5 staging: rtl8723bs: rtw_efuse: Fix coding = style) 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 (46bdcac533cc interconnect: qcom: Add SC7280 interconn= ect provider driver) Merging dmaengine/next (8d11cfb0c375 dmaengine: imx-sdma: Remove platform d= ata header) Merging cgroup/for-next (cfeaa699186e Merge branch 'for-5.13-fixes' into fo= r-next) Merging scsi/for-next (5c1d996e5af6 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (2506f5dcb828 scsi: mvsas: Use DEVICE_ATTR_RO()/R= W() macro) Merging vhost/linux-next (7ff6e99e021c virtio_net: disable cb aggressively) Merging rpmsg/for-next (7486f29e5e60 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 (c34c1228fc1c docs: driver-api: gpio: using= -gpio.rst: avoid using ReST :doc:`foo` markup) CONFLICT (modify/delete): Documentation/devicetree/bindings/gpio/gpio-davin= ci.txt deleted in gpio-brgl/gpio/for-next and modified in HEAD. Version HEA= D of Documentation/devicetree/bindings/gpio/gpio-davinci.txt left in tree. $ git rm -f Documentation/devicetree/bindings/gpio/gpio-davinci.txt Merging gpio-intel/for-next (043d7f09bf61 gpiolib: acpi: Add acpi_gpio_get_= io_resource()) Merging pinctrl/for-next (c477d9c76b1e 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 (c3975a73ca94 pinctrl: renesas: r8a= 77980: Add bias pinconf support) Merging pinctrl-samsung/for-next (6efb943b8616 Linux 5.13-rc1) Merging pwm/for-next (d233504af7db dt-bindings: pwm: pwm-tiehrpwm: Add comp= atible string for AM64 SoC) Merging userns/for-next (5e6b8a50a7ce cred: add missing return error code w= hen 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 (4896df9d53ae selftests/sgx: remove checks for file = execute permissions) 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 (94af1e732abe rtc: pcf8563: Fix the datasheet URL) 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 (28293b6c68cd ntb: ntb_pingpong: remove redundant init= ialization of variables msg_data and spad_data) Merging seccomp/for-next/seccomp (fe092fc9f14b selftests/seccomp: Flush ben= chmark output) CONFLICT (content): Merge conflict in kernel/seccomp.c Merging kspp/for-next/kspp (e7abbafcb176 Merge branch 'for-next/clang/featu= res' 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 (9ab1428dfe2c fsi/sbefifo: Fix reset timeout) 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 (76a2b9a8ab44 nvmem: qfprom: Improve the comment abo= ut regulator setting) Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from id= r_find_test_1) Merging hyperv/hyperv-next (7d815f4afa87 PCI: hv: Add check for hyperv_init= ialized in init_hv_pci_drv()) CONFLICT (content): Merge conflict in arch/x86/hyperv/hv_init.c Applying: x86: move of part of "Fix leftover comment typos" Merging auxdisplay/auxdisplay (c784e46c8445 auxdisplay: Add I2C gpio expand= er example) Merging kgdb/kgdb/for-next (c8daba4640ac kgdb: Fix fall-through warning for= Clang) Merging hmm/hmm (fe07bfda2fb9 Linux 5.12-rc1) Merging fpga/for-next (d97176f6040f fpga: dfl: pci: add device IDs for Sili= com N501x PAC cards) 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://g= it.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging mhi/mhi-next (3bd1d916c79b bus: mhi: core: Add range checks for BHI= and BHIe) 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 cra= te) 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 (21083f51521f cxl/pmem: Register 'pmem' / cxl_nvdimm devic= es) Merging tpmdd-jejb/tpmdd-for-next (69977d1aeeca Merge branch 'tpmdd-fixes' = into tpmdd-for-next) Merging akpm-current/current (a36d4becadea linux-next-pre) CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in lib/dump_stack.c CONFLICT (content): Merge conflict in include/linux/compiler_types.h CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.h CONFLICT (content): Merge conflict in arch/riscv/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/kernel/smp.c $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base "git add/rm ", 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 --a= bort". CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup-common.c Merging akpm/master (5bd9b8a69457 powerpc/mm: enable HAVE_MOVE_PMD support) --Sig_/CIOcg5NsgTv5DiL5Wx7TW_1 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDZqxwACgkQAVBC80lX 0GyG7wf/RDoAU5H2cnDjRNkb62ySo7HeoXMkdo2JQ6kDCPi6Ib5YNtGreqpSpzqR 4pCg5oOEcjcY6L3wkNLM29HXQxpQzwuu37WTTuugEylZ0md3xxKZ4+YPJjhNc0iT +S2yDwMmEMMecNzd6UE1q14M7u2okMEvdAzpBES64OMJcdcgEK39kF/B7Z5i/EjS mKZhMpMjWCrvSD48HSNXJpf0lNlNc4uvGGGZpLrFd5+HYVSHFZIStScTulUF8f+9 CfeKBqxzSvWGeGQ73ftK21e7+ASx0QZ8MOpr7zYl8nvkFJdGW4zXvT6JQZFSV4c+ 4FVMw4niQbQEMNLoktQUpY4EsKBJyA== =B8fA -----END PGP SIGNATURE----- --Sig_/CIOcg5NsgTv5DiL5Wx7TW_1--