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 5C1B3ECE58E for ; Wed, 9 Oct 2019 05:09:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B22B21835 for ; Wed, 9 Oct 2019 05:09:23 +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="CkdvAQ/C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730336AbfJIFJW (ORCPT ); Wed, 9 Oct 2019 01:09:22 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:48963 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729040AbfJIFJV (ORCPT ); Wed, 9 Oct 2019 01:09:21 -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 46p2Ly3QF6z9sN1; Wed, 9 Oct 2019 16:09:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1570597754; bh=CB6QicVq8E5NYwtQj2jJqeUmBAIpQ/fVh65CSBbzF7w=; h=Date:From:To:Cc:Subject:From; b=CkdvAQ/CSomDAyPIcrteBaB9fgLQ3KBWgJN5Pveyq/80ToW0fR35szM+v8f+zgSWl tW6ceVqdCFvzDCdDh1CfhyWvnVJuCv0oMlvRNxcZ6TMOluJ+FbNX4DzgkOg75Y0tyR aIm+YzE9+MHVsDxKUhitGM5GqFph8nKt2HDrGfno9hLqLbpJV9do8ch9zNm6x+qM6L Bp+V3OHGzRT22GvegdCDo1thyDGQn5fEqMGLLv2LE8NsAfZ5LLD4m0oBdEf0V6i1wA Pk+ThoYvoIZViKS/q9CWIllCADBLQTdpFnI1YRboPGNLLxfKdfMm11VuHMHcbfLh0I puUnER5Kiw/YA== Date: Wed, 9 Oct 2019 16:09:14 +1100 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Oct 9 Message-ID: <20191009160914.033d91d5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/FYFgbTBf_.5ZTxN2MTSNVA_"; 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_/FYFgbTBf_.5ZTxN2MTSNVA_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20191008: The bpf-next tree gained a conflict against the bpf tree. The drm-misc tree gained conflicts against the drm tree and a semantic conflict against the amdgpu tree. The staging tree lost its build failure. Non-merge commits (relative to Linus' tree): 3142 3370 files changed, 105935 insertions(+), 55650 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 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 314 trees (counting Linus' and 78 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 (d5001955c281 Merge tag 'gpio-v5.4-2' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fixes/master (54ecb8f7028c Linux 5.4-rc1) Merging kbuild-current/fixes (b8d5e105ebbf scripts: setlocalversion: fix a = bashism) Merging arc-current/for-curr (41277ba7eb4e ARC: mm: tlb flush optim: elide = redundant uTLB invalidates for MMUv3) Merging arm-current/fixes (5b3efa4f1479 ARM: 8901/1: add a criteria for pfn= _valid of arm) Merging arm-soc-fixes/arm/fixes (60c1b3e25728 ARM: multi_v7_defconfig: Fix = SPI_STM32_QSPI support) Merging arm64-fixes/for-next/fixes (3e7c93bd04ed arm64: armv8_deprecated: C= hecking return value for memory allocation) Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache= ()) Merging powerpc-fixes/fixes (3439595d5b85 selftests/powerpc: Fix compile er= ror on tlbie_test due to newer gcc) Merging s390-fixes/fixes (da0c9ea146cb Linux 5.4-rc2) Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (503c9addef61 ptp: fix typo of "mechanism" in Kconfig he= lp text) Merging bpf/master (98beb3edeb97 samples/bpf: Add a workaround for asm_inli= ne) Merging ipsec/master (68ce6688a5ba net: sched: taprio: Fix potential intege= r overflow in taprio_set_picos_per_byte) Merging netfilter/master (503c9addef61 ptp: fix typo of "mechanism" in Kcon= fig help text) Merging ipvs/master (503c9addef61 ptp: fix typo of "mechanism" in Kconfig h= elp text) Merging wireless-drivers/master (98d22b01f9f6 rt2x00: remove input-polldev.= h header) Merging mac80211/master (dc0c18ed229c mac80211: fix scan when operating on = DFS channels in ETSI domains) Merging rdma-fixes/for-rc (0417791536ae RDMA/mlx5: Add missing synchronize_= srcu() for MW cases) Merging sound-current/for-linus (130bce3afbbb ALSA: hdac: clear link output= stream mapping) Merging sound-asoc-fixes/for-linus (456e6594c461 Merge branch 'asoc-5.4' in= to asoc-linus) Merging regmap-fixes/for-linus (54ecb8f7028c Linux 5.4-rc1) Merging regulator-fixes/for-linus (4a3ab8e34117 Merge branch 'regulator-5.4= ' into regulator-linus) Merging spi-fixes/for-linus (fdce5b9c5b56 Merge branch 'spi-5.4' into spi-l= inus) Merging pci-current/for-linus (54ecb8f7028c Linux 5.4-rc1) Merging driver-core.current/driver-core-linus (82af5b660967 sysfs: Fixes __= BIN_ATTR_WO() macro) Merging tty.current/tty-linus (fc64f7abbef2 serial: 8250_omap: Fix gpio che= ck for auto RTS/CTS) Merging usb.current/usb-linus (623170ff5971 usb:cdns3: Fix for CV CH9 runni= ng with g_zero driver.) Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix= races between fsg_disable and fsg_set_alt) Merging usb-serial-fixes/usb-linus (7d7e21fafdbc USB: serial: keyspan: fix = NULL-derefs on open() and write()) Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: u= dc: workaround for endpoint conflict issue) Merging phy/fixes (54ecb8f7028c Linux 5.4-rc1) Merging staging.current/staging-linus (80b15db5e1e9 staging: vt6655: Fix me= mory leak in vt6655_probe) Merging char-misc.current/char-misc-linus (fc739a058d99 misc: fastrpc: prev= ent memory leak in fastrpc_dma_buf_attach) Merging soundwire-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5) Merging thunderbolt-fixes/fixes (747125db6dcd thunderbolt: Drop unnecessary= read when writing LC command in Ice Lake) Merging input-current/for-linus (bd3b84802376 Input: goodix - add support f= or 9-bytes reports) Merging crypto-current/master (f703964fc668 crypto: arm/aes-ce - add depend= ency on AES library) Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible) Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device cr= eate/remove with parent removal) Merging kselftest-fixes/fixes (ce3a67780212 selftests: watchdog: Add comman= d line option to show watchdog_info) Merging modules-fixes/modules-linus (fcfacb9f8374 doc: move namespaces.rst = from kbuild/ to core-api/) Merging slave-dma-fixes/fixes (04cbfba62085 Merge tag 'dmaengine-5.4-rc1' o= f git://git.infradead.org/users/vkoul/slave-dma) Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1) Merging mtd-fixes/mtd/fixes (df8fed831cbc mtd: rawnand: au1550nd: Fix au_re= ad_buf16() prototype) Merging mfd-fixes/for-mfd-fixes (4d82fa67dd6b mfd: rk808: Make PM function = declaration static) Merging v4l-dvb-fixes/fixes (3e84a18a259e media: meson/ao-cec: move cec_not= ifier_cec_adap_register after hw setup) Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null = check on pointer dev) Merging mips-fixes/mips-fixes (88356d09904b MIPS: include: Mark __cmpxchg a= s __always_inline) Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) Merging omap-fixes/fixes (647c8977e111 ARM: dts: am3874-iceboard: Fix 'i2c-= mux-idle-disconnect' usage) Merging kvm-fixes/master (da0c9ea146cb Linux 5.4-rc2) Merging kvms390-fixes/master (53936b5bf35e KVM: s390: Do not leak kernel st= ack data in the KVM_S390_INTERRUPT ioctl) Merging hwmon-fixes/hwmon (11c943a1a635 hwmon: docs: Extend inspur-ipsps1 t= itle underline) Merging nvdimm-fixes/libnvdimm-fixes (4c806b897d60 libnvdimm/region: Enable= MAP_SYNC for volatile regions) Merging btrfs-fixes/next-fixes (26966e98a28b Merge branch 'misc-5.4' into n= ext-fixes) Merging vfs-fixes/fixes (d4f4de5e5ef8 Fix the locking in dcache_readdir() a= nd friends) Merging dma-mapping-fixes/for-linus (2cf2aa6a69db dma-mapping: fix false po= sitivse warnings in dma_common_free_remap()) Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) Merging drivers-x86-fixes/fixes (54ecb8f7028c Linux 5.4-rc1) Merging samsung-krzk-fixes/fixes (54ecb8f7028c Linux 5.4-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1) Merging devicetree-fixes/dt/linus (f437ade3296b dt-bindings: phy: lantiq: F= ix Property Name) Merging scsi-fixes/fixes (b23f330d5145 scsi: MAINTAINERS: Update qla2xxx dr= iver) Merging drm-fixes/drm-fixes (da0c9ea146cb Linux 5.4-rc2) Merging amdgpu-fixes/drm-fixes (c0e70e10b11b drm/amd/display: fix dcn21 Mak= efile for clang) Merging drm-intel-fixes/for-linux-next-fixes (b925708f28c2 drm/i915: Mark c= ontents as dirty on a write fault) Merging mmc-fixes/fixes (faf97b84fa86 mmc: sh_mmcif: Use platform_get_irq_o= ptional() for optional interrupt) Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1) Merging gnss-fixes/gnss-linus (54ecb8f7028c Linux 5.4-rc1) Merging hyperv-fixes/hyperv-fixes (83b50f83a968 Drivers: hv: vmbus: Fix har= mless building warnings without CONFIG_PM_SLEEP) Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe= _pin_request()) Merging risc-v-fixes/fixes (727a399b7476 riscv: remove the switch statement= in do_trap_break()) Merging pidfd-fixes/fixes (5ca3d87b3828 taskstats: fix data-race) Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of = optional confd gpio) Merging spdx/spdx-linus (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/li= nux/kernel/git/netdev/net) Merging gpio-intel-fixes/fixes (54ecb8f7028c Linux 5.4-rc1) Merging pinctrl-intel-fixes/fixes (260996c30f4f pinctrl: cherryview: restor= e Strago DMI workaround for all versions) Merging erofs-fixes/fixes (da0c9ea146cb Linux 5.4-rc2) Merging drm-misc-fixes/for-linux-next-fixes (cc635be34eb6 drm/panel: tpo-td= 043mtea1: Fix SPI alias) Merging kspp-gustavo/for-next/kspp (da0c9ea146cb Linux 5.4-rc2) Merging kbuild/for-next (da676aa92374 kconfig: split util.c out of parser.y) Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (c7d9eccb3c1e mmc: renesas_sdhi_internal_dmac:= Add MMC_CAP2_MERGE_CAPABLE) Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to defau= lt BUG_ON(x)) Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7) Merging arm/for-next (3a6d5fc43760 Merge branches 'fixes' and 'misc' into f= or-next) Merging arm64/for-next/core (e376897f424a arm64: remove __iounmap) Merging arm-perf/for-next/perf (c8b0de762e0b perf/smmuv3: use devm_platform= _ioremap_resource() to simplify code) Merging arm-soc/for-next (be78662f5e30 Merge branch 'arm/fixes' into for-ne= xt) Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps= ' into next) Merging amlogic/for-next (31e508a2bfdb Merge branch 'v5.5/dt64' into tmp/am= l-rebuild) Merging aspeed/for-next (ba0fdbb07d05 Merge branch 'dt-for-v5.4' into for-n= ext) Merging at91/at91-next (9072e308f698 Merge branches 'at91-drivers', 'at91-s= oc' and 'at91-dt' into at91-next) Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into = for-next) Merging imx-mxs/for-next (fade20c4077b Merge branch 'imx/defconfig' into fo= r-next) Merging keystone/next (008ea917df67 Merge branch 'for_5.5/keystone-dts' int= o next) Merging mediatek/for-next (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into f= or-next) Merging mvebu/for-next (53fccfb4be90 Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (7968f13dadce Merge branch 'omap-for-v5.5/ti-sysc' in= to for-next) Merging qcom/for-next (a5ff49630785 Merge branches 'arm64-for-5.5', 'driver= s-for-5.5' and 'dts-for-5.5' into for-next) Merging renesas/next (ae688e1720fd arm64: dts: renesas: hihope-common: Fix = eMMC status) Merging renesas-geert/next (aca0770d9702 Merge branches 'renesas-arm-dt-for= -v5.5', 'renesas-arm64-defconfig-for-v5.5', 'renesas-arm64-dt-for-v5.5', 'r= enesas-drivers-for-v5.5' and 'renesas-dt-bindings-for-v5.5' into renesas-ne= xt) Merging reset/reset/next (bdb369e1e98a reset: add support for the Meson-A1 = SoC Reset Controller) Merging rockchip/for-next (7ba0ed602ef7 Merge branch 'v5.4-armsoc/dtsfixes'= into for-next) Merging samsung-krzk/for-next (8216ec3fda49 Merge branch 'next/dt' into for= -next) Merging scmi/for-linux-next (54ecb8f7028c Linux 5.4-rc1) Merging sunxi/sunxi/for-next (d49380083493 Merge branch 'sunxi/dt-for-5.5' = into sunxi/for-next) Merging tegra/for-next (d40c8de825cc Merge branch for-5.5/arm64/dt into for= -next) Merging clk/clk-next (51f9d768d5b8 Merge branch 'clk-marvell' into clk-next) Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1) 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 (f7dafb0af1de csky: Add setup_initrd check code) Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_s= ize_t etc. to posix_types.h) Merging ia64/next (0d3d343560ba genirq: remove the is_affinity_mask_valid h= ook) Merging m68k/for-next (0f1979b402df m68k: Remove ioremap_fullcache()) Merging m68knommu/for-next (da0c9ea146cb Linux 5.4-rc2) Merging microblaze/next (39014c45467f microblaze: entry: Remove unneeded ne= ed_resched() loop) Merging mips/mips-next (a14bf1dc494a MIPS: generic: Use __initconst for con= st init data) Merging nds32/next (932296120543 nds32: add new emulations for floating poi= nt instruction) Merging nios2/for-next (91d99a724e9c nios2: force the string buffer NULL-te= rminated) Merging openrisc/for-next (f3b17320db25 openrisc: map as uncached in iorema= p) Merging parisc-hd/for-next (0836e665ade9 parisc: Fix vmap memory leak in io= remap()/iounmap()) Merging powerpc/next (45824fc0da6e Merge tag 'powerpc-5.4-1' of git://git.k= ernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dm= a_set_mask") Merging soc-fsl/next (eadf0b17b43d bus: fsl-mc: remove explicit device_link= _del) Merging risc-v/for-next (9ce06497c272 irqchip/sifive-plic: set max threshol= d for ignored handlers) 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 (da0c9ea146cb Linux 5.4-rc2) Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attribu= tes.h) CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh= -next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.= h left in tree. CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh= -next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.= h left in tree. $ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types= .h Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.k= ernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging uml/linux-next (73625ed66389 um: irq: Fix LAST_IRQ usage in init_IR= Q()) Merging xtensa/xtensa-for-next (ede62d7397ec Merge branch 'xtensa-5.5' into= xtensa-for-next) Merging fscrypt/master (0642ea2409f3 ext4 crypto: fix to check feature stat= us before get policy) Merging afs/afs-next (a0753c29004f afs: Support RCU pathwalk) Merging btrfs/next (29dcea88779c Linux 4.17) Merging btrfs-kdave/for-next (f41d3117280a Merge branch 'for-next-next-v5.4= -20191001' into for-next-20191001) Merging ceph/master (3ee5a7015c8b ceph: call ceph_mdsc_destroy from destroy= _fs_client) Merging cifs/for-next (d3f8236c7b0b CIFS: Force reval dentry if LOOKUP_REVA= L flag is set) Merging configfs/for-next (e9c03af21cc7 configfs: calculate the symlink tar= get only once) Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecry= ptfs_init_messaging()) Merging erofs/dev (da0c9ea146cb Linux 5.4-rc2) Merging ext3/for_next (0f7dbaee76f4 Merge quota initialization check fix fr= om Chao Yu.) Merging ext4/dev (040823b5372b Merge tag 'unicode-next-v5.4' of https://git= .kernel.org/pub/scm/linux/kernel/git/krisman/unicode into dev) Merging f2fs/dev (b145b0eb2031 Merge tag 'for-linus' of git://git.kernel.or= g/pub/scm/virt/kvm/kvm) Merging fsverity/fsverity (95ae251fe828 f2fs: add fs-verity support) Merging fuse/for-next (54ecb8f7028c Linux 5.4-rc1) Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initializat= ion) Merging nfs/linux-next (da0c9ea146cb Linux 5.4-rc2) Merging nfs-anna/linux-next (a8fd0feeca35 pNFS/filelayout: enable LAYOUTGET= on OPEN) Merging nfsd/nfsd-next (832b2cb95543 svcrdma: Improve DMA mapping trace poi= nts) Merging orangefs/for-next (e6b998ab62be orangefs: remove redundant assignme= nt to err) Merging overlayfs/overlayfs-next (5c2e9f346b81 ovl: filter of trusted xattr= results in audit) Merging ubifs/linux-next (6a379f67454a jffs2: Fix memory leak in jffs2_scan= _eraseblock() error path) Merging v9fs/9p-next (aafee43b7286 9p/vfs_super.c: Remove unused parameter = data in v9fs_fill_super) Merging xfs/for-next (6350744c66a4 xfs: move local to extent inode logging = into bmap helper) Merging iomap/iomap-for-next (838c4f3d7515 iomap: move the iomap_dio_rw ->e= nd_io callback into a structure) Merging djw-vfs/vfs-for-next (dc617f29dbe5 vfs: don't allow writes to swap = files) Merging file-locks/locks-next (b41dae061bbd Merge tag 'xfs-5.4-merge-7' of = git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging vfs/for-next (3e501af8dd7b Merge branches 'work.misc', 'work.mount3= ', 'work.namei', 'work.dcache' and 'work.autofs' into for-next) Merging printk/for-next (c38822ab9bd6 Merge branch 'for-5.4' into for-next) Merging pci/next (da9c3eaa31f2 Merge branch 'pci/virtualization') Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2) Merging hid/for-next (75799e7ed50e Merge branch 'for-5.5/logitech' into for= -next) Merging i2c/i2c/for-next (54ecb8f7028c Linux 5.4-rc1) Merging i3c/i3c/next (f12b524ea386 i3c: master: use i3c_dev_get_master()) Merging dmi/master (c11f2bc422b9 firmware: dmi: Fix unlikely out-of-bounds = read in save_mem_devices) Merging hwmon-staging/hwmon-next (b2a7ca7a1322 hwmon: abituguru: make array= probe_order static, makes object smaller) Merging jc_docs/docs-next (f704985b1e7e docs/driver-api: Catch up with dma_= buf file-name changes) CONFLICT (content): Merge conflict in Documentation/admin-guide/cgroup-v2.r= st Merging v4l-dvb/master (219031a6e7df media: venus: fix build on 32bit envir= onments) Merging v4l-dvb-next/master (167f4555184b Merge branch fixes_for_upstream i= nto to_next) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo = in imxfb_probe()) Merging pm/linux-next (315ea754a4c4 Merge branch 'pm-cpuidle' into linux-ne= xt) Merging cpufreq-arm/cpufreq/arm/linux-next (f75d2accca77 Merge branch 'cpuf= req/qcom-updates' into cpufreq/arm/linux-next) Merging cpupower/cpupower (7e5705c635ec tools/power/cpupower: Fix initializ= er override in hsw_ext_cstates) Merging opp/opp/linux-next (071afa50609d Merge branch 'opp/qcom-updates' in= to opp/linux-next) Merging thermal/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 (812cd88749e0 firewire: mark expected switch fall= -throughs) Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugf= s_create functions) Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having calle= d xen_create_contiguous_region()) Merging rdma/for-next (909624d8db5b IB/cm: Use container_of() instead of ty= pecast) Merging net-next/master (11fc7d5a0a2d tun: fix memory leak in error path) Applying: rxrpc: fix up for "rxrpc: Fix trace-after-put looking at the put = peer record" Merging bpf-next/master (f05c2001ecc9 Merge branch 'bpf-libbpf-helpers') CONFLICT (content): Merge conflict in tools/lib/bpf/Makefile Merging ipsec-next/master (4361f5b6118a xfrm: remove the unnecessary .net_e= xit for xfrmi) Merging mlx5-next/mlx5-next (7d47433cf74f net/mlx5: Expose optimal performa= nce scatter entries capability) Merging netfilter-next/master (f8615bf8a3da netfilter: ipset: move ip_set_g= et_ip_port() to ip_set_bitmap_port.c.) Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warning= s) CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c Merging ipvs-next/master (ac524481d7f7 ipvs: batch __ip_vs_dev_cleanup) Merging wireless-drivers-next/master (f170d44bc4ec rsi: fix potential null = dereference in rsi_probe()) Merging bluetooth/master (840aff3994c8 Bluetooth: btusb: Use IS_ENABLED ins= tead of #ifdef) Merging mac80211-next/master (2ce113de3132 mac80211: simplify TX aggregatio= n start) Merging gfs2/for-next (f6ef4bff81cc gfs2: Fix memory leak when gfs2meta's f= s_context is freed) Merging mtd/mtd/next (b34c095ca609 mtd: st_spi_fsm: remove unused field fro= m struct stfsm) Merging nand/nand/next (5121b4219972 dt-bindings: mtd: Add Cadence NAND con= troller driver) Merging spi-nor/spi-nor/next (54ecb8f7028c Linux 5.4-rc1) Merging crypto/master (eff9771d5152 crypto: caam - use mapped_{src,dst}_nen= ts for descriptor) Merging drm/drm-next (97ea56540ffc Merge tag 'drm-intel-next-2019-10-07' of= git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_g= em.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_mma= n.c Merging amdgpu/drm-next (127bd7e93135 drm/amdgpu: move gpu reset out of amd= gpu_device_suspend) CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/renoir_= ppt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_priv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_charde= v.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/Makefile Merging drm-intel/for-linux-next (458863e08e13 drm/i915: Mark contents as d= irty on a write fault) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/i915_g= em.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_mma= n.c Merging drm-tegra/drm/tegra/for-next (9d5a54987265 drm/tegra: Fix ordering = of cleanup code) Merging drm-misc/for-linux-next (94e2ec3f7fef drm/vkms: prime import suppor= t) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_vma.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_exe= cbuffer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm= /amdgpu_dm_mst_types.c Applying: cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_un= register()" Applying: drm/amdkfd: update for drmP.h removal Merging drm-msm/msm-next (8fbd534b7248 drm/msm/dpu: Remove set but not used= variables 'mode', 'dpu_kms', 'priv') Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic= commits that disable only the plane) 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 (4d24376370fb gpu: ipu-v3: image-convert: only= sample into the next tile if necessary) Merging etnaviv/etnaviv/next (dbcc574a4bfa drm/etnaviv: fix missing unlock = on error in etnaviv_iommuv1_context_alloc()) Merging regmap/for-next (54ecb8f7028c Linux 5.4-rc1) Merging sound/for-next (82e8d723e9e6 sound: Fix Kconfig indentation) Merging sound-asoc/for-next (d1cb6c0891c7 Merge branch 'asoc-5.5' into asoc= -next) CONFLICT (content): Merge conflict in sound/soc/samsung/Kconfig Merging modules/modules-next (54ecb8f7028c Linux 5.4-rc1) Merging input/next (3df955f870c2 Input: gpio_mouse - switch to using input = device polling mode) Merging block/for-next (c121a069344a Merge branch 'for-5.5/block' into for-= next) Merging device-mapper/for-next (633b1613b2a4 dm snapshot: rework COW thrott= ling to fix deadlock) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol = disabling for Ricoh bridges) Merging mmc/next (25812fcf7403 mmc: mmci: make unexported functions static) Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers in= stead of hashed addresses) CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barri= er) Merging mfd/for-mfd-next (38a6fc63a3ea mfd: db8500-prcmu: Example using new= OF_MFD_CELL/MFD_CELL_BASIC MACROs) Merging backlight/for-backlight-next (c0b64faf0fe6 backlight: pwm_bl: Set s= cale type for brightness curves specified in the DT) Merging battery/for-next (7f7378618b41 power: supply: cpcap-charger: Enable= vbus boost voltage) Merging regulator/for-next (70336ab5ded1 Merge branch 'regulator-5.5' into = regulator-next) Merging security/next-testing (45893a0abee6 kexec: Fix file verification on= S390) Merging apparmor/apparmor-next (136db994852a apparmor: increase left match = history buffer size) Merging integrity/next-integrity (2a7f0e53daf2 ima: ima_api: Use struct_siz= e() in kzalloc()) Merging keys/keys-next (1f96e0f129eb Merge branch 'keys-acl' into keys-next) CONFLICT (content): Merge conflict in include/linux/key.h CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified = in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tr= ee. CONFLICT (content): Merge conflict in fs/afs/security.c 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 $ git rm -f fs/crypto/keyinfo.c Applying: fsverity: merge fix for keyring_alloc API change Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permiss= ions checking with an ACL" Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions = checking with an ACL" Merging selinux/next (42345b68c2e3 selinux: default_range glblub implementa= tion) Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inod= e_smack::smk_lock) Merging tomoyo/master (23641a048089 printk: Monitor change of console logle= vel.) Merging tpmdd/next (e13cd21ffd50 tpm: Wrap the buffer from the caller to tp= m_buf in tpm_send()) Merging watchdog/master (ca2fc5efffde watchdog: f71808e_wdt: Add F81803 sup= port) Merging iommu/next (142dfcda5a35 Merge branch 'iommu/fixes' into next) Merging vfio/next (e6c5d727db0a Merge branches 'v5.4/vfio/alexey-tce-memory= -free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3'= , 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into = v5.4/vfio/next) Merging audit/next (245d73698ed7 audit: Report suspicious O_CREAT usage) Merging devicetree/for-next (a36a383dc301 Merge branch 'dt/linus' into dt/n= ext) Merging mailbox/mailbox-for-next (556a0964e28c mailbox: qcom-apcs: fix max_= register value) Merging spi/for-next (944572040aac Merge remote-tracking branch 'spi/topic/= ptp' into spi-next) Merging tip/auto-latest (80bb240ac08b Merge branch 'core/objtool') Merging clockevents/clockevents/next (befd04abfbe4 clocksource/drivers/sh_c= mt: Document "cmt-48" as deprecated) CONFLICT (content): Merge conflict in kernel/time/posix-timers.c Merging edac/edac-for-next (f05390d30e20 EDAC: skx_common: get rid of unuse= d type var) Merging irqchip/irq/irqchip-next (bb0fed1c60cc irqchip/sifive-plic: Switch = to fasteoi flow) Merging ftrace/for-next (8ed4889eb831 selftests/ftrace: Fix same probe erro= r test) Merging rcu/rcu/next (049b405029c0 MAINTAINERS: Update from paulmck@linux.i= bm.com to paulmck@kernel.org) Merging kvm/linux-next (da0c9ea146cb Linux 5.4-rc2) Merging kvm-arm/next (61f8d64aae65 arm64: KVM: Handle PMCR_EL0.LC as RES1 o= n pure AArch64 systems) Merging kvm-ppc/kvm-ppc-next (ff42df49e75f KVM: PPC: Book3S HV: Don't lose = pending doorbell request on migration on P9) Merging kvms390/next (f76f6371643b KVM: s390: Cleanup kvm_arch_init error p= ath) Merging xen-tip/linux-next (c6875f3aacf2 x86/xen: Return from panic notifie= r) Merging percpu/for-next (69f98a60cdbb Merge branch 'for-5.4' into for-next) Merging workqueues/for-next (30ae2fc0a75e workqueue: Minor follow-ups to th= e rescuer destruction change) Merging drivers-x86/for-next (54ecb8f7028c Linux 5.4-rc1) Merging chrome-platform/for-next (e6679fd1e2fc platform/chrome: wilco_ec: A= dd debugfs test_event file) Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platfo= rm_get_irq()) Merging leds/for-next (7ae4717cb9cb leds: core: Fix leds.h structure docume= ntation) Merging ipmi/for-next (c9acc3c4f8e4 ipmi_si_intf: Fix race in timer shutdow= n handling) Merging driver-core/driver-core-next (201e91091b1d sh: add the sh_ prefix t= o early platform symbols) Merging usb/usb-next (2538f0ee8a29 usb: host: xhci-tegra: Add Tegra194 XHCI= support) Merging usb-gadget/next (18a93cd38be3 usb: gadget: net2280: Add workaround = for AB chip Errata 11) Merging usb-serial/usb-next (54ecb8f7028c Linux 5.4-rc1) Merging usb-chipidea-next/ci-for-usb-next (f14ac41f977f usb: chipidea: core= : change vbus-regulator as optional) Merging phy-next/next (54ecb8f7028c Linux 5.4-rc1) Merging tty/tty-next (7726fb53e75f tty:n_gsm.c: destroy port by tty_port_de= stroy()) Merging char-misc/char-misc-next (3e917975b7cd mei: me: fix me_intr_clear f= unction name in KDoc) Merging extcon/extcon-next (e81b88932985 extcon-intel-cht-wc: Don't reset U= SB data connection at probe) Merging soundwire/next (dfcff3f8a5f1 soundwire: stream: make stream name a = const pointer) Merging thunderbolt/next (da0c9ea146cb Linux 5.4-rc2) Merging staging/staging-next (d49d1c76b96e staging: comedi: Remove set but = not used variable 'aref') Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for= -next) Merging icc/icc-next (44223a8b45d7 interconnect: qcom: Fix icc_onecell_data= allocation) Merging slave-dma/next (c5c6faaee6e0 dmaengine: ti: edma: Use bitmap_set() = instead of open coded edma_set_bits()) Merging cgroup/for-next (1a99fcc035fb selftests: cgroup: Run test_core unde= r interfering stress) Merging scsi/for-next (dda08a80d659 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (e1f92b500067 Merge branch '5.5/scsi-queue' into = 5.5/scsi-next) Merging vhost/linux-next (0d4a3f2abbef Revert "vhost: block speculation of = translated descriptors") Merging rpmsg/for-next (741dc0aa4122 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (6dd9b912c9b4 Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (5ede17d61592 dt-bindings: gpio: rcar: Add = DT binding for r8a774b1) Merging gpio-intel/for-next (54ecb8f7028c Linux 5.4-rc1) Merging pinctrl/for-next (4afb0edace60 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (da0c9ea146cb Linux 5.4-rc2) Merging pinctrl-samsung/for-next (a322b3377f4b pinctrl: samsung: Fix device= node refcount leaks in init code) Merging pwm/for-next (81420020e691 pwm: sun4i: Drop redundant assignment to= variable pval) Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG= _MEMORY_FAILURE in do_sigbus) Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect= .pl) Merging random/dev (58be0106c530 random: fix soft lockup when trying to rea= d from an uninitialized blocking pool) Merging kselftest/next (54ecb8f7028c Linux 5.4-rc1) Merging y2038/y2038 (870e0167cd9c Merge tag 'compat-ioctl-5.4-2' of git://g= it.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038) Merging livepatching/for-next (1cfe141e1715 Merge branch 'for-5.4-core' int= o for-next) Merging coresight/next (acfec525a78a coresight: etm4x: Add support for Thun= derX2) Merging rtc/rtc-next (09ef18bcd5ac rtc: use devm_platform_ioremap_resource(= ) to simplify code) Merging nvdimm/libnvdimm-for-next (4c806b897d60 libnvdimm/region: Enable MA= P_SYNC for volatile regions) Merging at24/at24/for-next (285be87c79e1 eeprom: at24: Improve confusing lo= g message) Merging ntb/ntb-next (54ecb8f7028c Linux 5.4-rc1) Merging kspp/for-next/kspp (6f88ed285e67 Merge branch 'fixes/usercopy/highm= em-fromlist' into for-next/kspp) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (54ecb8f7028c Linux 5.4-rc1) Merging fsi/next (799e064cc79e fsi: scom: Don't abort operations for minor = errors) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging slimbus/for-next (54ecb8f7028c Linux 5.4-rc1) Merging nvmem/for-next (b76e01ccc287 nvmem: imx: scu: fix dependency in Kco= nfig) Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single en= try at 0) Merging hyperv/hyperv-next (41928dfdf5bd Drivers: hv: balloon: Remove depen= dencies on guest page size) Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) Merging kgdb-dt/kgdb/for-next (d8a050f5a3e8 kgdb: fix comment regarding sta= tic function) Merging pidfd/for-next (c2ba8f41ad36 perf_event_open: switch to copy_struct= _from_user()) Merging devfreq/for-next (d2f5fccd1ac9 PM / devfreq: Make log message more = explicit when devfreq device already exists) Merging hmm/hmm (54ecb8f7028c Linux 5.4-rc1) Merging fpga/for-next (d20c0da8b202 fpga: Remove dev_err() usage after plat= form_get_irq()) Merging kunit/test (d460623c5fa1 Documentation: kunit: Fix verification com= mand) Merging akpm-current/current (1dd4e9b5f0a9 ipc/msg.c: consolidate all xxxct= l_down() functions) $ git checkout -b akpm remotes/origin/akpm/master Applying: samples/watch_queue/watch_test: fix build Applying: pinctrl: fix pxa2xx.c build warnings Applying: kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debug= ging Instruments' Applying: kernel-hacking: create submenu for arch special debugging options Applying: kernel-hacking: group kernel data structures debugging together Applying: kernel-hacking: move kernel testing and coverage options to same = submenu Applying: kernel-hacking: move Oops into 'Lockups and Hangs' Applying: kernel-hacking: move SCHED_STACK_END_CHECK after DEBUG_STACK_USAGE Applying: kernel-hacking: create a submenu for scheduler debugging options Applying: kernel-hacking: move DEBUG_BUGVERBOSE to 'printk and dmesg option= s' Applying: kernel-hacking: move DEBUG_FS to 'Generic Kernel Debugging Instru= ments' Applying: drivers/tty/serial/sh-sci.c: suppress warning Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer ove= rflow Merging akpm/master (9ba4b35423b1 drivers/media/platform/sti/delta/delta-ip= c.c: fix read buffer overflow) --Sig_/FYFgbTBf_.5ZTxN2MTSNVA_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl2da3oACgkQAVBC80lX 0GyeZwgAkUVV3Yo86A4f3Txs6bc0GM6P5hhMSDBhNfr/7Nla7KF/iBcqZm9oMkpy Dfb+wS8kSpWlhqLGhS5jQqWR+U97V/OAzVNZ07+Mfi2OsgjgalYqK+w9okOpKGpb A7RkOIQhGE2c96Xo4zHvICcDzvTzaUy19wEX2Nm3pooYs8IcuCZ95RMP3hMdNXGF YfH2xy5emW4iKuvImso8ucYbMSp0EItGHjW9UHcEfAc4xZqYjZ5821mYBKiiG2NU LW3pJiRNfpIUHVYVVZmR7d72KhAL8GErB6Ay9pfbkQZ879nfgAO+J7bZhcHtFZYh lTuXp6ba6sZQ8L5KUO0js38E4Ag4AQ== =XtwF -----END PGP SIGNATURE----- --Sig_/FYFgbTBf_.5ZTxN2MTSNVA_--