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=-5.1 required=3.0 tests=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=unavailable 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 A04C6C433DF for ; Fri, 5 Jun 2020 06:56:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E6F720899 for ; Fri, 5 Jun 2020 06:56:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="kRcTi/Wr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726187AbgFEG4u (ORCPT ); Fri, 5 Jun 2020 02:56:50 -0400 Received: from ozlabs.org ([203.11.71.1]:57451 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726024AbgFEG4u (ORCPT ); Fri, 5 Jun 2020 02:56:50 -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 49dYNB49Cxz9sSJ; Fri, 5 Jun 2020 16:56:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1591340202; bh=p2LuasrB+lhdJV1eNeED9tFcbpRHQlm0BfBwrEJXFgk=; h=Date:From:To:Cc:Subject:From; b=kRcTi/WrfB4rFGzElTCIt4rdjw/0rv4gipxTccT8ucFP1+ehP1HfCVgCFx2aXbJ5F O3BYR1uv94OLiWs7isrCERNzfjO06gJwVrRjwJD+LvPDVu9KRHWfm8h9ldSCBovdIb 93KiMdy7emTeDfELU7WNhFcerrHK2EwhfgtqVQAOK/SzUG+NLI2aORDEvg1UyHBWW8 OCvvBNvQTfFH9CIAa2gVmKP2mBSZPv/SaAnGEBE/1aIVa/SLUKCPPsg9oK8BJZbXdt 0YFcC3tc9urIoux3ViqP6ohsDTJ18p0+U0TStlunY0u2zuiSxkiQHClB7H237J+Jyb t0mHX1Og3zKrQ== Date: Fri, 5 Jun 2020 16:56:41 +1000 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jun 5 Message-ID: <20200605165641.37a57b9b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/v2wXLyeUlualSevHUHqw0Wa"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/v2wXLyeUlualSevHUHqw0Wa Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, News: there will be no linux-release on Monday and (probably) Tuesday. News: The merge window has opened, so please do *not* add v5.9 material to your linux-next included branches until after v5.8-rc1 has been released. Changes since 20200604: Linus' tree gained a build failure for which I cherry-picked a commit from the modules tree. My fixes tree contains: 4cb4bfffe2c1 ("device_cgroup: Fix RCU list debugging warning") The sound-current tree gained a build failure for which I reverted a commit. The kbuild tree gained a conflict against Linus' tree. The v4l-dvb-next tree gained a conflict against Linus' tree. The akpm tree gained conflicts against the sh tree and lost several patches that turned up there. Non-merge commits (relative to Linus' tree): 6315 7118 files changed, 536576 insertions(+), 127302 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 324 trees (counting Linus' and 82 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 (15a2bc4dbb9c Merge branch 'exec-linus' of git://git.= kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) Merging fixes/master (da03d0610044 device_cgroup: Fix RCU list debugging wa= rning) Applying: module: break nested ARCH_HAS_STRICT_MODULE_RWX and STRICT_MODULE= _RWX #ifdefs Merging kbuild-current/fixes (6a8b55ed4056 Linux 5.7-rc3) Merging arc-current/for-curr (9d9368e839c2 ARC: [arcompact] fix bitrot with= 2 levels of interrupt) Merging arm-current/fixes (3866f217aaa8 ARM: 8977/1: ptrace: Fix mask for t= humb breakpoint hook) Merging arm-soc-fixes/arm/fixes (99706d62fb50 Merge tag 'omap-for-v5.7/cpsw= -fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linu= x-omap into arm/fixes) Merging uniphier-fixes/fixes (0e698dfa2822 Linux 5.7-rc4) Merging arm64-fixes/for-next/fixes (ba051f097fc3 arm64/kernel: Fix return v= alue when cpu_online() fails in __cpu_up()) Merging m68k-current/for-linus (3381df095419 m68k: tools: Replace zero-leng= th array with flexible-array member) Merging powerpc-fixes/fixes (2f26ed1764b4 powerpc/64s: Disable sanitisers f= or C syscall/interrupt entry/exit code) Merging s390-fixes/fixes (3d77e6a8804a Linux 5.7) Merging sparc/master (fcdf818d239e Merge branch 'sparc-scnprintf') Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty= inodes after removing key) Merging net/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/linux/k= ernel/git/netdev/net-next) Merging bpf/master (e7ed83d6fa1a bpf: Fix an error code in check_btf_func()) Merging ipsec/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/linux= /kernel/git/netdev/net-next) Merging netfilter/master (bdc48fa11e46 checkpatch/coding-style: deprecate 8= 0-column warning) Merging ipvs/master (0141317611ab Merge branch 'hns3-fixes') Merging wireless-drivers/master (f92f26f2ed2c iwlwifi: pcie: handle QuZ con= figs with killer NICs as well) Merging mac80211/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/li= nux/kernel/git/netdev/net-next) Merging rdma-fixes/for-rc (3d77e6a8804a Linux 5.7) Merging sound-current/for-linus (3398e5c7b038 ALSA: usb-audio: Manage auto-= pm of all bundled interfaces) Merging sound-asoc-fixes/for-linus (1dd9cd775ef5 Merge remote-tracking bran= ch 'asoc/for-5.8' into asoc-linus) Merging regmap-fixes/for-linus (323ca2daef47 Merge remote-tracking branch '= regmap/for-5.8' into regmap-linus) Merging regulator-fixes/for-linus (5fb565b69dab Merge remote-tracking branc= h 'regulator/for-5.8' into regulator-linus) Merging spi-fixes/for-linus (7ce6dc9ef58d Merge remote-tracking branch 'spi= /for-5.8' into spi-linus) Merging pci-current/for-linus (ef46738cc47a MAINTAINERS: Add Rob Herring an= d remove Andy Murray as PCI reviewers) Merging driver-core.current/driver-core-linus (9cb1fd0efd19 Linux 5.7-rc7) Merging tty.current/tty-linus (9cb1fd0efd19 Linux 5.7-rc7) Merging usb.current/usb-linus (b9bbe6ed63b2 Linux 5.7-rc6) Merging usb-gadget-fixes/fixes (172b14b48ca1 usb: cdns3: gadget: make a bun= ch of functions static) Merging usb-serial-fixes/usb-linus (399ad9477c52 USB: serial: option: add T= elit LE910C1-EUX compositions) Merging usb-chipidea-fixes/ci-for-usb-stable (b3f3736ac305 usb: chipidea: m= sm: Ensure proper controller reset using role switch API) Merging phy/fixes (820eeb9de62f phy: qualcomm: usb-hs-28nm: Prepare clocks = in init) Merging staging.current/staging-linus (9cb1fd0efd19 Linux 5.7-rc7) Merging char-misc.current/char-misc-linus (9cb1fd0efd19 Linux 5.7-rc7) Merging soundwire-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) Merging thunderbolt-fixes/fixes (3d77e6a8804a Linux 5.7) Merging input-current/for-linus (642aa86eaf8f Input: synaptics - add a seco= nd working PNP_ID for Lenovo T470s) Merging crypto-current/master (320bdbd81615 crypto: cavium/nitrox - Fix 'ni= trox_get_first_device()' when ndevlist is fully iterated) Merging ide/master (63bef48fd6c9 Merge branch 'akpm' (patches from Andrew)) Merging vfio-fixes/for-linus (5cbf3264bc71 vfio/type1: Fix VA->PA translati= on for PFNMAP VMAs in vaddr_get_pfn()) Merging kselftest-fixes/fixes (851c4df54dc1 selftests/lkdtm: Use grep -E in= stead of egrep) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure= to pass all module source files to spatch) Merging slave-dma-fixes/fixes (3a5fd0dbd878 dmaengine: tegra210-adma: Fix a= n error handling path in 'tegra_adma_probe()') Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) Merging mtd-fixes/mtd/fixes (f3a6a6c5e0f5 mtd:rawnand: brcmnand: Fix PM res= ume crash) Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after = changing mt6397-core) Merging v4l-dvb-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified= HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (8f3d9f354286 Linux 5.7-rc1) Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) Merging omap-fixes/fixes (636338d7968e bus: ti-sysc: Increase max softreset= wait) Merging kvm-fixes/master (6929f71e46bd atomisp: avoid warning about unused = function) Merging kvms390-fixes/master (5615e74f48dc KVM: s390: Remove false WARN_ON_= ONCE for the PQAP instruction) Merging hwmon-fixes/hwmon (ac11b65c0d26 hwmon: (bt1-pvt) Define Temp- and V= olt-to-N poly as maybe-unused) Merging nvdimm-fixes/libnvdimm-fixes (f84afbdd3a9e libnvdimm: Out of bounds= read in __nd_ioctl()) Merging btrfs-fixes/next-fixes (4f28062adf92 Merge branch 'misc-5.7' into n= ext-fixes) Merging vfs-fixes/fixes (9e4636545933 copy_xstate_to_kernel(): don't leave = parts of destination uninitialized) Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the co= rrect dma mask when we are bypassing the IOMMU) Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) Merging drivers-x86-fixes/fixes (2ef96a5bb12b Linux 5.7-rc5) Merging samsung-krzk-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (8f3d9f354286 Linux 5.7-rc1) Merging devicetree-fixes/dt/linus (4bc77b2d211e dt-bindings: phy: qcom-qusb= 2: Fix defaults) Merging scsi-fixes/fixes (f2e6b75f6ee8 scsi: target: Put lun_ref at end of = tmr processing) Merging drm-fixes/drm-fixes (3d77e6a8804a Linux 5.7) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_= cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (822d6bd1890d drm/i915: work a= round false-positive maybe-uninitialized warning) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c Merging mmc-fixes/fixes (202500d21654 mmc: block: Fix use-after-free issue = for rpmb) Merging rtc-fixes/rtc-fixes (8f3d9f354286 Linux 5.7-rc1) Merging gnss-fixes/gnss-linus (2ef96a5bb12b Linux 5.7-rc5) Merging hyperv-fixes/hyperv-fixes (38dce4195f0d x86/hyperv: Properly suspen= d/resume reenlightenment notifications) Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq h= andlers after dpio create) Merging risc-v-fixes/fixes (8356c379cfba RISC-V: gp_in_global needs registe= r keyword) Merging pidfd-fixes/fixes (3f2c788a1314 fork: prevent accidental access to = clone3 features) Merging fpga-fixes/fixes (9edd5112d963 fpga: zynqmp: fix modular build) Merging spdx/spdx-linus (3d77e6a8804a Linux 5.7) Merging gpio-intel-fixes/fixes (8f3d9f354286 Linux 5.7-rc1) Merging pinctrl-intel-fixes/fixes (69388e15f507 pinctrl: cherryview: Add mi= ssing spinlock usage in chv_gpio_irq_handler) Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_d= esc()) Merging drm-misc-fixes/for-linux-next-fixes (abf56fadf0e2 gpu/drm: Ingenic:= Fix opaque pointer casted to wrong type) Applying: Revert "ALSA: usb-audio: Manage auto-pm of all bundled interfaces" Merging kspp-gustavo/for-next/kspp (fb24bed5c035 w1: Replace zero-length ar= ray with flexible-array) Merging kbuild/for-next (a2cf32b91f01 Merge branch 'kbuild' into for-next) CONFLICT (modify/delete): arch/mips/lasat/image/Makefile deleted in HEAD an= d modified in kbuild/for-next. Version kbuild/for-next of arch/mips/lasat/i= mage/Makefile left in tree. $ git rm -f arch/mips/lasat/image/Makefile Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (94d1aed9f477 Merge branch 'dma-sg_table-helpe= r' into dma-mapping-for-next) Merging asm-generic/master (060dc911501f nds32: fix build failure caused by= page table folding updates) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (03c7f5f0b844 Merge branches 'fixes' and 'misc' into f= or-next) Merging arm64/for-next/core (5311ebfb612f arm64: debug: mark a function as = __init to save some memory) Merging arm-perf/for-next/perf (10f6cd2af21b pmu/smmuv3: Clear IRQ affinity= hint on device removal) Merging arm-soc/for-next (28107944fb70 soc: document merges) Merging amlogic/for-next (9233c526bc0e Merge branch 'v5.8/defconfig' into t= mp/aml-rebuild) Merging aspeed/for-next (fa4c8ec6feaa ARM: dts: aspeed: Change KCS nodes to= v2 binding) Merging at91/at91-next (ec539e70d882 Merge branches 'at91-soc', 'at91-dt' a= nd 'at91-defconfig' into at91-next) Merging imx-mxs/for-next (0414897ac89f Merge branch 'imx/defconfig' into fo= r-next) Merging keystone/next (a158c2b7ec23 Merge branch 'for_5.8/driver-soc' into = next) Merging mediatek/for-next (64ee939736e7 Merge branch 'v5.7-next/soc' into f= or-next) Merging mvebu/for-next (869da228bd45 Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (712c602893d7 Merge branch 'fixes' into for-next) Merging qcom/for-next (98cfcf1a9c54 Merge branches 'arm64-defconfig-for-5.8= ', 'arm64-for-5.8', 'drivers-for-5.8' and 'dts-for-5.8' into for-next) Merging raspberrypi/for-next (f5e216e42689 ARM: dts: bcm283x: Use firmware = PM driver for V3D) Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (1bd79704bee2 Merge branch 'renesas-dt-bindings-for-v5= .8' into renesas-next) Merging reset/reset/next (a6138255cc91 dt-bindings: reset: Convert i.MX7 re= set to json-schema) Merging rockchip/for-next (8a66d46f4035 Merge branch 'v5.8-armsoc/dts64' in= to for-next) Merging samsung-krzk/for-next (0f6a82638f62 Merge branch 'next/dt-late' int= o for-next) Merging scmi/for-linux-next (28b06b8e59fc Merge branch 'for-next/juno' of g= it://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-li= nux-next) Merging sunxi/sunxi/for-next (243cd8fba48d Merge branch 'sunxi/dt-for-5.8' = into sunxi/for-next) Merging tegra/for-next (cd049d898ab8 Merge branch for-5.8/arm64/dt into for= -next) Merging ti-k3/ti-k3-next (cae809434da1 arm64: dts: ti: k3-j721e-main: Add m= ain domain watchdog entries) Merging uniphier/for-next (0e698dfa2822 Linux 5.7-rc4) Merging clk/clk-next (166e4b484197 Merge branches 'clk-vc5', 'clk-hsdk', 'c= lk-mediatek' and 'clk-baikal' into clk-next) CONFLICT (content): Merge conflict in arch/mips/loongson2ef/Kconfig CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/mediatek/me= diatek,pericfg.txt deleted in HEAD and modified in clk/clk-next. Version cl= k/clk-next of Documentation/devicetree/bindings/arm/mediatek/mediatek,peric= fg.txt left in tree. $ git rm -f Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg= .txt Applying: dt-bindings: fix up for "dt-bindings: clock: mediatek: document c= lk bindings for Mediatek MT6765 SoC" Merging clk-samsung/for-next (25bdae0f1c66 clk: samsung: exynos5433: Add IG= NORE_UNUSED flag to sclk_i2s1) Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://= git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging csky/linux-next (f36e0aab6f1f csky: Fixup CONFIG_DEBUG_RSEQ) Merging h8300/h8300-next (beab3d5cb0e1 irq-renesas-h8s: Fix external interr= upt control.) Merging ia64/next (172e7890406d tty/serial: cleanup after ioc*_serial drive= r removal) Merging m68k/for-next (3381df095419 m68k: tools: Replace zero-length array = with flexible-array member) Merging m68knommu/for-next (9e2b6ed41f8f m68k,nommu: fix implicit cast from= __user in __{get,put}_user_asm()) Merging microblaze/next (8f3d9f354286 Linux 5.7-rc1) Merging mips/mips-next (9bd0bd264578 MIPS: ralink: drop ralink_clk_init for= mt7621) Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPI= LE) Merging nios2/for-next (0ec8a5054d7f MAINTAINERS: Remove nios2-dev@lists.ro= cketboards.org) Merging openrisc/for-next (6bd140e14d9a openrisc: Fix issue with argument c= lobbering for clone/fork) Merging parisc-hd/for-next (3d77e6a8804a Linux 5.7) Merging powerpc/next (1395375c5927 Merge branch 'topic/ppc-kvm' into next) CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridg= es) Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline fun= ction qbman_write_eqcr_am_rt_register) Merging risc-v/for-next (09c0533d129c soc: sifive: l2 cache: Mark l2_get_pr= iv_group as static) Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git= ://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) Merging s390/features (bfa50e1427e4 vfio-ccw: make vfio_ccw_regops variable= s declarations static) CONFLICT (content): Merge conflict in arch/s390/kvm/vsie.c CONFLICT (content): Merge conflict in arch/s390/kernel/smp.c Merging sh/for-next (37744feebc08 sh: remove sh5 support) Merging sparc-next/master (824c874abc1d Merge branch 'for-davem' of git://g= it.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging uml/linux-next (f6e8c474390b um: virtio: Replace zero-length array = with flexible-array) Merging xtensa/xtensa-for-next (3ead2f97bd44 xtensa: Fix spelling/grammar i= n comment) Merging fscrypt/master (e3b1078bedd3 fscrypt: add support for IV_INO_LBLK_3= 2 policies) Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algo= rithm to reprobe/retry more quickly) Merging btrfs/for-next (8113246479a5 Merge branch 'for-next-next-v5.7-20200= 528' into for-next-20200528) Merging ceph/master (dc1dad8e1a61 rbd: compression_hint option) Merging cifs/for-next (331cc667a99c cifs: update internal module version nu= mber) Merging configfs/for-next (8aebfffacfa3 configfs: fix config_item refcnt le= ak in configfs_rmdir()) Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git:/= /git.samba.org/sfrench/cifs-2.6) Merging erofs/dev (34f853b849eb erofs: suppress false positive last_block w= arning) Merging exfat/dev (657ff37dfcd1 exfat: fix incorrect update of stream entry= in __exfat_truncate()) Merging ext3/for_next (16ec8bfe257b Pull ext2 xattr cleanups.) Merging ext4/dev (6b8ed62008a4 ext4: avoid unnecessary transaction starts d= uring writeback) CONFLICT (content): Merge conflict in fs/ext4/ioctl.c CONFLICT (content): Merge conflict in fs/ext4/extents.c CONFLICT (content): Merge conflict in Documentation/filesystems/fiemap.rst Merging f2fs/dev (35942e2134fa f2fs: attach IO flags to the missing cases) CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h Merging fsverity/fsverity (9cd6b593cfc9 fs-verity: remove unnecessary exter= n keywords) Merging fuse/for-next (9b46418c40fe fuse: copy_file_range should truncate c= ache) Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flex= ible-array member) Merging nfs/linux-next (3d77e6a8804a Linux 5.7) Merging nfs-anna/linux-next (07e620d607d9 NFS: Fix direct WRITE throughput = regression) Merging nfsd/nfsd-next (037e910b52b0 SUNRPC: Remove unreachable error condi= tion in rpcb_getport_async()) CONFLICT (content): Merge conflict in net/sunrpc/svcsock.c CONFLICT (content): Merge conflict in net/sunrpc/svc_xprt.c CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h Merging orangefs/for-next (0df556457748 orangefs: convert get_user_pages() = --> pin_user_pages()) Merging overlayfs/overlayfs-next (81e69c8b9e02 ovl: add nosync mount option) Merging ubifs/linux-next (4b68bf9a69d2 ubi: Select fastmap anchor PEBs cons= idering wear level rules) Merging v9fs/9p-next (36f9967531da 9p/xen: increase XEN_9PFS_RING_ORDER) Merging xfs/for-next (6dcde60efd94 xfs: more lockdep whackamole with kmem_a= lloc*) Merging zonefs/for-next (568776f992c4 zonefs: Replace uuid_copy() with impo= rt_uuid()) Merging iomap/iomap-for-next (b75dfde12129 fibmap: Warn and return an error= in case of block > INT_MAX) Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr= _dax_invalidate()) Merging file-locks/locks-next (5ef159681309 locks: add locks_move_blocks in= posix_lock_inode) Merging vfs/for-next (b09e728da62f Merge branches 'work.misc', 'work.epoll'= , 'uaccess.misc', 'uaccess.hpsa' and 'uaccess.i915' into for-next) Merging printk/for-next (e35456906bd4 Merge branch 'for-5.8' into for-next) Merging pci/next (2bd81cd04a3f Merge branch 'remotes/lorenzo/pci/vmd') CONFLICT (content): Merge conflict in drivers/pci/quirks.c Merging pstore/for-next/pstore (78c08247b9d3 mtd: Support kmsg dumper based= on pstore/blk) Merging hid/for-next (5d7d489e9129 Merge branch 'for-5.8/multitouch' into f= or-next) Merging i2c/i2c/for-next (0997aa2d80dd Merge branch 'i2c/for-5.8' into i2c/= for-next) Merging i3c/i3c/next (b4203ce05563 i3c master: GETMRL's 3rd byte is optiona= l even with BCR_IBI_PAYLOAD) Merging dmi/master (8cf87c744696 firmware/dmi: Report DMI Bios & EC firmwar= e release) Merging hwmon-staging/hwmon-next (ac11b65c0d26 hwmon: (bt1-pvt) Define Temp= - and Volt-to-N poly as maybe-unused) Merging jc_docs/docs-next (e35b5a4c494a Documentation: fixes to the maintai= ner-entry-profile template) Merging v4l-dvb/master (938b29db3aa9 media: Documentation: media: Refer to = mbus format documentation from CSI-2 docs) Merging v4l-dvb-next/master (be4b9e888184 media: atomisp: get rid of a stri= ng_support.h abstraction layer) CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/ato= misp_v4l2.c Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo = in imxfb_probe()) Merging pm/linux-next (5947e801f2e1 Merge branches 'pm-opp' and 'pm-cpufreq= ' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (6cc3d0e9a097 cpufreq: tegra186:= add CPUFREQ_NEED_INITIAL_FREQ_CHECK flag) Merging cpupower/cpupower (7b0bf99b9ee4 cpupower: Remove unneeded semicolon) Merging opp/opp/linux-next (45679f9b508f opp: Don't parse icc paths unneces= sarily) Merging thermal/thermal/linux-next (64488908b523 thermal/int340x_thermal: D= on't require IDSP to exist) 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 (fe204591cc94 dlm: remove BUG() before panic()) Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having calle= d xen_create_contiguous_region()) Merging rdma/for-next (fba97dc7fc76 RDMA/cm: Spurious WARNING triggered in = cm_destroy_id()) Merging net-next/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/li= nux/kernel/git/netdev/net-next) Applying: xfrm: merge fixup for "remove output_finish indirection from xfrm= _state_afinfo" Merging bpf-next/master (cb8e59cc8720 Merge git://git.kernel.org/pub/scm/li= nux/kernel/git/netdev/net-next) Merging ipsec-next/master (9a25c1df24a6 Merge git://git.kernel.org/pub/scm/= linux/kernel/git/bpf/bpf-next) Merging mlx5-next/mlx5-next (6b646a7e4af6 net/mlx5: Add ability to read and= write ECE options) Merging netfilter-next/master (9a25c1df24a6 Merge git://git.kernel.org/pub/= scm/linux/kernel/git/bpf/bpf-next) Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for mu= ltiple devices per netdev hook) Merging wireless-drivers-next/master (1806c13dc253 Merge git://git.kernel.o= rg/pub/scm/linux/kernel/git/netdev/net) Merging bluetooth/master (4c07a5d7aeb3 Bluetooth: hci_qca: Fix an error poi= nter dereference) Merging mac80211-next/master (cb8e59cc8720 Merge git://git.kernel.org/pub/s= cm/linux/kernel/git/netdev/net-next) Merging gfs2/for-next (ea22eee4e602 gfs2: Allow lock_nolock mount to specif= y jid=3DX) Merging mtd/mtd/next (48e9912e0330 Merge tag 'cfi/for-5.8' of gitolite.kern= el.org:pub/scm/linux/kernel/git/mtd/linux into mtd/next) Merging nand/nand/next (86f2b225adf4 mtd: rawnand: Add an invalid ECC mode = to discriminate with valid ones) Merging spi-nor/spi-nor/next (e8aec15dd584 mtd: spi-nor: winbond: Fix 4-byt= e opcode support for w25q256) Merging crypto/master (58ca0060ec4e crypto: hisilicon - fix driver compatib= ility issue with different versions of devices) Merging drm/drm-next (9ca1f474cea0 Merge tag 'amd-drm-next-5.8-2020-05-27' = of git://people.freedesktop.org/~agd5f/linux into drm-next) Merging amdgpu/drm-next (624a498a539a drm/amdgpu: add another raven1 gfxoff= quirk) Merging drm-intel/for-linux-next (f8665d797b1c Merge tag 'gvt-next-fixes-20= 20-05-28' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) Merging drm-tegra/drm/tegra/for-next (d1c746f8b59d drm/tegra: hub: Do not e= nable orphaned window group) Merging drm-misc/for-linux-next (968d81a64a88 drm/connector: notify userspa= ce on hotplug after register complete) Merging drm-msm/msm-next (1cb2c4a2c89b Revert "drm/msm/dpu: add support for= clk and bw scaling for display") Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Ad= d optional property node define for Mali DP500) Merging imx-drm/imx-drm/next (2c76b324c794 drm/imx: parallel-display: Adjus= t bus_flags handling) Merging etnaviv/etnaviv/next (f232d9ec029c drm/etnaviv: fix TS cache flushi= ng on GPUs with BLT engine) Merging regmap/for-next (323ca2daef47 Merge remote-tracking branch 'regmap/= for-5.8' into regmap-linus) Merging sound/for-next (3398e5c7b038 ALSA: usb-audio: Manage auto-pm of all= bundled interfaces) Merging sound-asoc/for-next (1dd9cd775ef5 Merge remote-tracking branch 'aso= c/for-5.8' into asoc-linus) Merging modules/modules-next (5c3a7db0c7ec module: Harden STRICT_MODULE_RWX) CONFLICT (content): Merge conflict in kernel/module.c Merging input/next (d0ac7079d5fc Input: iqs269a - add missing I2C dependenc= y) Merging block/for-next (09b9828e0a3e Merge branch 'async-buffered.6' into f= or-next) Applying: fix up for merge conflict with rdma tree Merging device-mapper/for-next (d776dc57aea4 dm crypt: avoid truncating the= logical block size) CONFLICT (content): Merge conflict in drivers/md/dm-zoned-metadata.c Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() s= tatic) Merging mmc/next (ae5c0585dfc2 dt-bindings: mmc: Convert sdhci-pxa to json-= schema) Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barri= er) Merging mfd/for-mfd-next (098c4adf249c mfd: mt6360: Remove duplicate REGMAP= _IRQ_REG_LINE() entry) Merging backlight/for-backlight-next (479da1f538a2 backlight: Add backlight= _device_get_by_name()) Merging battery/for-next (972eabb97aab Revert "power: supply: sbs-battery: = simplify read_read_string_data") Merging regulator/for-next (5fb565b69dab Merge remote-tracking branch 'regu= lator/for-5.8' into regulator-linus) Merging security/next-testing (56f2e3b7d819 capabilities: add description f= or CAP_SETFCAP) Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false f= or bool variable) Merging integrity/next-integrity (6cc7c266e5b4 ima: Call ima_calc_boot_aggr= egate() in ima_eventdigest_init()) Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key= type) Merging selinux/next (fe5a90b8c149 selinux: netlabel: Remove unused inline = function) Merging smack/next (ef26650a201f Smack: Remove unused inline function smk_a= d_setfield_u_fs_path_mnt) Merging tomoyo/master (039aeb9deb92 Merge tag 'for-linus' of git://git.kern= el.org/pub/scm/virt/kvm/kvm) Merging tpmdd/next (32a767afb0d8 tpm: Fix TIS locality timeout problems) Merging watchdog/master (072cb8b628d3 watchdog: m54xx: Add missing include) Merging iommu/next (431275afdc71 iommu: Check for deferred attach in iommu_= group_do_dma_attach()) CONFLICT (content): Merge conflict in drivers/iommu/s390-iommu.c Merging vfio/next (4f085ca2f5a8 Merge branch 'v5.8/vfio/kirti-migration-fix= es' into v5.8/vfio/next) Merging audit/next (9d44a121c5a7 audit: add subj creds to NETFILTER_CFG rec= ord to) Merging devicetree/for-next (8211d1e83ade dt-bindings: clock: Add documenta= tion for X1830 bindings.) CONFLICT (modify/delete): Documentation/devicetree/bindings/watchdog/renesa= s,wdt.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD= of Documentation/devicetree/bindings/watchdog/renesas,wdt.txt left in tree. CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pci= /cdns-pcie.yaml CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net= /qcom,ipa.yaml CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/dis= play/panel/panel-common.yaml CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm= /socionext/uniphier.yaml $ git rm -f Documentation/devicetree/bindings/watchdog/renesas,wdt.txt Merging mailbox/mailbox-for-next (d61b7997ca46 MAINTAINERS: Add entry for Q= ualcomm IPCC driver) Merging spi/for-next (7ce6dc9ef58d Merge remote-tracking branch 'spi/for-5.= 8' into spi-linus) Merging tip/auto-latest (0c1e35bf0c7b Merge branch 'WIP.x86/mm') CONFLICT (content): Merge conflict in arch/sparc/mm/srmmu.c Applying: KVM: SVM: fix up for do_machine_check() API change Merging clockevents/timers/drivers/next (809eb4e9bf9d dt-bindings: timer: A= dd renesas,em-sti bindings) Merging edac/edac-for-next (daeb3bc9a92f Merge branch 'edac-misc' into edac= -for-next) Merging irqchip/irq/irqchip-next (5a7f796d4f20 irqchip/loongson-pci-msi: Fi= x a typo in Kconfig) CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig Merging ftrace/for-next (daceabf1b494 tracing/doc: Fix ascii-art in histogr= am-design.rst) Merging rcu/rcu/next (8747b07d1944 Merge branch 'kcsan-dev.2020.04.13c' int= o HEAD) Merging kvm/linux-next (6929f71e46bd atomisp: avoid warning about unused fu= nction) Merging kvm-arm/next (7ae2f3db6167 KVM: arm64: Flush the instruction cache = if not unmapping the VM on reboot) Merging kvm-ppc/kvm-ppc-next (11362b1befea KVM: PPC: Book3S HV: Close race = with page faults around memslot flushes) Merging kvms390/next (0b545fd17f84 KVM: s390: remove unneeded semicolon in = gisa_vcpu_kicker()) Merging xen-tip/linux-next (4969a3a2cd3c xen/pci: Get rid of verbose_reques= t and use dev_dbg() instead) Merging percpu/for-next (dedac37ea96b Merge branch 'for-5.7' into for-next) Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for= compile time test instead of WARN_ON()) Merging drivers-x86/for-next (47a94c551a74 platform/x86: dcdbas: Check SMBI= OS for protected buffer address) Merging chrome-platform/for-next (bbb7ad49b835 platform/chrome: cros_usbpd_= logger: Add __printf annotation to append_str()) Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging leds/for-next (59ea3c9faf32 leds: add aw2013 driver) Merging ipmi/for-next (2a556ce779e3 ipmi:ssif: Remove dynamic platform devi= ce handing) Merging driver-core/driver-core-next (8c3e315d4296 driver core: Update devi= ce link status correctly for SYNC_STATE_ONLY links) Merging usb/usb-next (347052e3bf1b usb: dwc3: meson-g12a: fix USB2 PHY init= ialization on G12A and A1 SoCs) Merging usb-gadget/next (1c11e74e9079 usb: dwc3: keystone: Turn on USB3 PHY= before controller) Merging usb-serial/usb-next (c432df155919 USB: serial: ch341: fix lockup of= devices with limited prescaler) Merging usb-chipidea-next/ci-for-usb-next (c4100ef2dd42 Documentation: ABI:= usb: chipidea: Update Li Jun's e-mail) Merging phy-next/next (ac0a95a3ea78 phy: intel: Add driver support for Comb= oPhy) Merging tty/tty-next (a1b44ea340b2 tty: serial: qcom_geni_serial: Add 51.2M= Hz frequency support) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ser= ial/rs485.yaml Merging char-misc/char-misc-next (05c8a4fc44a9 habanalabs: correctly cast u= 64 to void*) Merging extcon/extcon-next (b2e5575a8d04 extcon: arizona: Fix runtime PM im= balance on error) Merging soundwire/next (fcbcf1f7b568 soundwire: intel: use a single module) Merging thunderbolt/next (4caf2511ec49 thunderbolt: Add trivial .shutdown) Merging staging/staging-next (77f55d1305c1 staging: rtl8723bs: Use common p= acket header constants) Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and= remove of_match_ptr) Merging icc/icc-next (b35da2e86f25 Merge branch 'icc-get-by-index' into icc= -next) Merging slave-dma/next (be4cf718cd99 dmaengine: imx-sdma: initialize all sc= ript addresses) Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgr= oup) Merging scsi/for-next (a7a4293b22df Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (06b43f968db5 scsi: hpsa: hpsa_ioctl(): Tidy up a= bit) Merging vhost/linux-next (1b09d0932913 virtio_net: CTRL_GUEST_OFFLOADS depe= nds on CTRL_VQ) Merging rpmsg/for-next (71f56fef13d4 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (74910e15ab25 gpio: pca953x: Drop unneeded ACPI_PTR()) Merging gpio-brgl/gpio/for-next (e33a58a29c6a gpio: pca935x: Allow IRQ supp= ort for driver built as a module) Merging gpio-intel/for-next (7e73aa90a38c gpio: merrifield: Better show how= GPIO and IRQ bases are derived from hardware) Merging pinctrl/for-next (94873f6b46f8 pinctrl: sprd: Fix the incorrect pul= l-up definition) Merging pinctrl-intel/for-next (6d649fca3491 pinctrl: intel: Move npins clo= ser to pin_base in struct intel_community) Merging pinctrl-samsung/for-next (f354157a7d18 pinctrl: samsung: Save/resto= re eint_mask over suspend for EINT_TYPE GPIOs) Merging pwm/for-next (f5641d053d46 pwm: Add missing "CONFIG_" prefix) Merging userns/for-next (d35bec8a5788 Merge proc-next and exec-next for tes= ting in linux-next) Merging ktest/for-next (1091c8fce8aa ktest: Fix typos in ktest.pl) Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA bu= ilds) Merging kselftest/next (382561a0f11c selftests/sysctl: Make sysctl test dri= ver as a module) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with= tv_nsec >=3D NSEC_PER_SEC") Merging livepatching/for-next (8631420cac7d Merge branch 'for-5.8/klp-modul= e-fixups' into for-next) Merging coresight/next (c9d7e3da1f3c fpga: dfl: afu: Corrected error handli= ng levels) Merging rtc/rtc-next (ac363ace16e0 rtc: abx80x: Add Device Tree matching ta= ble) Merging nvdimm/libnvdimm-for-next (f6d2b802f80d Merge branch 'for-5.7/libnv= dimm' into libnvdimm-for-next) Merging at24/at24/for-next (8f3d9f354286 Linux 5.7-rc1) Merging ntb/ntb-next (5a1daba43835 NTB: ntb_test: Fix bug when counting rem= ote files) Merging kspp/for-next/kspp (c7527373fe28 gcc-common.h: Update for GCC 10) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (9b5816b56af6 gnss: replace zero-length array with f= lexible-array) Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register va= lues) CONFLICT (content): Merge conflict in drivers/fsi/Kconfig Merging slimbus/for-next (f9a478d658a2 slimbus: core: Fix mismatch in of_no= de_get/put) Merging nvmem/for-next (be00147a195b MAINTAINERS: Add git tree for NVMEM FR= AMEWORK) Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas= _find_marked) Merging hyperv/hyperv-next (afaa33da08ab Drivers: hv: vmbus: Resolve more r= aces involving init_vp_index()) Merging auxdisplay/auxdisplay (3f03b6498172 auxdisplay: charlcd: Reuse hex_= to_bin() instead of custom code) Merging kgdb/kgdb/for-next (c893de12e1ef kdb: Remove the misfeature 'KDBFLA= GS') Merging pidfd/for-next (2b40c5db73e2 selftests/pidfd: add pidfd setns tests) Merging devfreq/devfreq-next (8fc0e48e0fae PM / devfreq: Use lockdep assert= s instead of manual checks for locked mutex) Merging hmm/hmm (f07e2f6be37a MAINTAINERS: add HMM selftests) Merging fpga/for-next (2d80c057efda fpga: dfl: afu: convert get_user_pages(= ) --> pin_user_pages()) Merging kunit/test (0e698dfa2822 Linux 5.7-rc4) Merging cel/cel-next (0a8e7b7d0846 SUNRPC: Revert 241b1f419f0e ("SUNRPC: Re= move xdr_buf_trim()")) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and d= evm_ioremap_nocache) Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flex= ible-array) Merging kunit-next/kunit (6d6861d45e38 security: apparmor: default KUNIT_* = fragments to KUNIT_ALL_TESTS) Merging trivial/for-next (c1a371cf80fb printk: fix global comment) Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) Merging mhi/mhi-next (3781a7a11294 bus: mhi: core: Handle syserr during pow= er_up) CONFLICT (content): Merge conflict in drivers/bus/mhi/core/pm.c Merging notifications/notifications-pipe-core (87a10a4bdb88 watch_queue: sa= mple: Display superblock notifications) CONFLICT (content): Merge conflict in samples/Makefile CONFLICT (content): Merge conflict in samples/Kconfig CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in include/linux/pipe_fs_i.h CONFLICT (content): Merge conflict in fs/mount.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 Applying: pipe: update for pipe_buf_operations changes Merging fsinfo/fsinfo-core (93737ccf05ec fsinfo: Add an attribute that list= s all the visible mounts in a namespace) CONFLICT (content): Merge conflict in samples/vfs/Makefile 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/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl Applying: extra syscall updates Merging akpm-current/current (6f04c0274786 linux-next-pre) CONFLICT (content): Merge conflict in kernel/sysctl.c CONFLICT (content): Merge conflict in include/linux/binfmts.h CONFLICT (content): Merge conflict in fs/binfmt_script.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 (modify/delete): arch/sh/kernel/process_64.c deleted in HEAD and m= odified in 297abef89458... kernel: rename show_stack_loglvl() =3D> show_sta= ck(). Version 297abef89458... kernel: rename show_stack_loglvl() =3D> show_= stack() of arch/sh/kernel/process_64.c left in tree. $ git rm -f arch/sh/kernel/process_64.c "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 (modify/delete): arch/sh/include/asm/pgtable_64.h deleted in HEAD = and modified in deb1c1d43098... sh: drop __pXd_offset() macros that duplica= te pXd_index() ones. Version deb1c1d43098... sh: drop __pXd_offset() macros= that duplicate pXd_index() ones of arch/sh/include/asm/pgtable_64.h left i= n tree. $ git rm -f arch/sh/include/asm/pgtable_64.h "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 (modify/delete): arch/sh/mm/tlbex_64.c deleted in HEAD and modifie= d in 1724b6b216a0... sh: add support for folded p4d page tables. Version 17= 24b6b216a0... sh: add support for folded p4d page tables of arch/sh/mm/tlbe= x_64.c left in tree. CONFLICT (modify/delete): arch/sh/mm/cache-sh5.c deleted in HEAD and modifi= ed in 1724b6b216a0... sh: add support for folded p4d page tables. Version 1= 724b6b216a0... sh: add support for folded p4d page tables of arch/sh/mm/cac= he-sh5.c left in tree. $ git rm -f arch/sh/mm/cache-sh5.c arch/sh/mm/tlbex_64.c "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 (modify/delete): arch/sh/kernel/traps_64.c deleted in HEAD and mod= ified in e0dfb30e78c8... mm: don't include asm/pgtable.h if linux/mm.h is a= lready included. Version e0dfb30e78c8... mm: don't include asm/pgtable.h if= linux/mm.h is already included of arch/sh/kernel/traps_64.c left in tree. CONFLICT (modify/delete): arch/sh/kernel/signal_64.c deleted in HEAD and mo= dified in e0dfb30e78c8... mm: don't include asm/pgtable.h if linux/mm.h is = already included. Version e0dfb30e78c8... mm: don't include asm/pgtable.h i= f linux/mm.h is already included of arch/sh/kernel/signal_64.c left in tree. CONFLICT (modify/delete): arch/sh/kernel/ptrace_64.c deleted in HEAD and mo= dified in e0dfb30e78c8... mm: don't include asm/pgtable.h if linux/mm.h is = already included. Version e0dfb30e78c8... mm: don't include asm/pgtable.h i= f linux/mm.h is already included of arch/sh/kernel/ptrace_64.c left in tree. CONFLICT (modify/delete): arch/sh/kernel/process_64.c deleted in HEAD and m= odified in e0dfb30e78c8... mm: don't include asm/pgtable.h if linux/mm.h is= already included. Version e0dfb30e78c8... mm: don't include asm/pgtable.h = if linux/mm.h is already included of arch/sh/kernel/process_64.c left in tr= ee. $ git rm -f arch/sh/kernel/process_64.c arch/sh/kernel/ptrace_64.c arch/sh/= kernel/signal_64.c arch/sh/kernel/traps_64.c "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 (modify/delete): arch/sh/include/asm/pgtable_64.h deleted in HEAD = and modified in 5a38753d985a... mm: consolidate pte_index() and pte_offset_= *() definitions. Version 5a38753d985a... mm: consolidate pte_index() and pt= e_offset_*() definitions of arch/sh/include/asm/pgtable_64.h left in tree. $ git rm -f arch/sh/include/asm/pgtable_64.h "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 (modify/delete): arch/sh/include/asm/pgtable_64.h deleted in HEAD = and modified in 880718f87334... mm: consolidate pmd_index() and pmd_offset(= ) definitions. Version 880718f87334... mm: consolidate pmd_index() and pmd_= offset() definitions of arch/sh/include/asm/pgtable_64.h left in tree. $ git rm -f arch/sh/include/asm/pgtable_64.h "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 (modify/delete): arch/sh/include/asm/pgtable_64.h deleted in HEAD = and modified in 2a025b3c4237... mm: consolidate pud_index() and pud_offset(= ) definitions. Version 2a025b3c4237... mm: consolidate pud_index() and pud_= offset() definitions of arch/sh/include/asm/pgtable_64.h left in tree. $ git rm -f arch/sh/include/asm/pgtable_64.h "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 (modify/delete): arch/sh/include/asm/pgtable_64.h deleted in HEAD = and modified in 25b447ae4474... mm: consolidate pgd_index() and pgd_offset{= _k}() definitions. Version 25b447ae4474... mm: consolidate pgd_index() and = pgd_offset{_k}() definitions of arch/sh/include/asm/pgtable_64.h left in tr= ee. $ git rm -f arch/sh/include/asm/pgtable_64.h dropping 0c1081557b88b73ff0cabff5a2cbea6b4397a915 sh: sh4a: bring back tmu3= _device early device -- patch contents already upstream dropping 5b740b022af856f05bb39e639d01bc56e1a9726e arch/sh: vmlinux.scr: ali= gn .rodata -- patch contents already upstream "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/sh/include/asm/io_noioport.h dropping a809b602653d9e252ed883b18e8fa88f9acd0602 sh-convert-ins-outs-macro= s-to-inline-functions-checkpatch-fixes -- patch contents already upstream dropping e9124b4e200fba32fb4b7e0577e9e817236972b5 sh: convert iounmap() mac= ros to inline functions -- patch contents already upstream Merging akpm/master (3d88da36f0a3 sh: add missing EXPORT_SYMBOL() for __del= ay) --Sig_/v2wXLyeUlualSevHUHqw0Wa Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7Z7KkACgkQAVBC80lX 0Gx/Mwf/UhdOZ84EBQ+G+RJbmUk87xILWa1F8LnYe9mGxuhAg2ICNk7+dbf3m2cx G8ZxjjLQoVBZsii1gBoCEdcqJcnDTOgoWVCC3Jnt5UTPMKZ/32YV3rpvHv09IXpJ EYycEVD0rHOOVsAwrsaKlBIONiYWE0rabH6yCBq5lk4oAUV3JdhHbI3golN29tco n9RrVlaLdPVe+R3nK+HQmCVZQR4uxxzVwIVclhxBIZBm86p4qACkyVubkgRjrYKB ip2QXjcYXEMeTf2YlngyJiN0WiKmGVNknwqE0I4rdb3H7cl7F1eosyDbLFv16ta+ 2M922Z3LW/ssPRqLhHk6bUjwcgQvQg== =NKQi -----END PGP SIGNATURE----- --Sig_/v2wXLyeUlualSevHUHqw0Wa--