From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: Tree for Jul 27 Date: Fri, 27 Jul 2018 21:34:12 +1000 Message-ID: <20180727213412.52b58f44@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/7/Zs9EkhTWXGl=nVr.N1lyu"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Linux-Next Mailing List Cc: Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org --Sig_/7/Zs9EkhTWXGl=nVr.N1lyu Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20180726: Dropped tree: kspp (undiagnosed build failure) The v4l-dvb tree gained a build failure for which I reverted a commit. The net-next tree gained a conflict against the rmda tree and a build failure for which I applied a fix patch. The drm tree gained a conflict against the v4l-dvb tree. The staging tree gained conflicts against the powerpc and devicetree trees. The kspp tree gained a build failure so I dropped it for today. The akpm-current tree lost its build failure and gained a conflict against the arm64 tree. Non-merge commits (relative to Linus' tree): 8930 8366 files changed, 372101 insertions(+), 163951 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 286 trees (counting Linus' and 65 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 (cd3f77d74ac3 Merge tag 'usb-4.18-rc7' of git://git.k= ernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.k= ernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (9d3cce1e8b85 Linux 4.18-rc5) Merging arc-current/for-curr (342d40bc040a ARC: dma [non IOC]: fix arc_dma_= sync_single_for_(device|cpu)) Merging arm-current/fixes (b4c7e2bd2eb4 ARM: 8780/1: ftrace: Only set kerne= l memory back to read-only after boot) Merging arm64-fixes/for-next/fixes (7b0eb6b41a08 arm64: fix vmemmap BUILD_B= UG_ON() triggering on !vmemmap setups) Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for= platform devices) Merging powerpc-fixes/fixes (b03897cf318d powerpc/powernv: Fix save/restore= of SPRG3 on entry/exit from stop (idle)) Merging sparc/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel= .org/pub/scm/linux/kernel/git/abelloni/linux) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (9e630bcb7701 RDS: RDMA: Fix the NULL-ptr deref in rds_i= b_get_mr) Merging bpf/master (d24458e43b10 xsk: fix poll/POLLIN premature returns) Merging ipsec/master (7284fdf39a91 esp6: fix memleak on error path in esp6_= input) Merging netfilter/master (049f56044d12 Merge git://git.kernel.org/pub/scm/l= inux/kernel/git/pablo/nf) Merging ipvs/master (0026129c8629 rhashtable: add restart routine in rhasht= able_free_and_destroy()) Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in p= arsing NVRAM for multiple devices) Merging mac80211/master (e31f6456c01c cfg80211: never ignore user regulator= y hint) Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt= AV port checks) Merging sound-current/for-linus (69756930f2de ALSA: cs5535audio: Fix invali= d endian conversion) Merging sound-asoc-fixes/for-linus (7adbdeaee174 Merge branch 'asoc-4.18' i= nto asoc-linus) Merging regmap-fixes/for-linus (d72e90f33aa4 Linux 4.18-rc6) Merging regulator-fixes/for-linus (3db3eff91bed Merge branch 'regulator-4.1= 8' into regulator-linus) Merging spi-fixes/for-linus (1ff16738af47 Merge branch 'spi-4.18' into spi-= linus) Merging pci-current/for-linus (bd91b56cb3b2 PCI/AER: Work around use-after-= free in pcie_do_fatal_recovery()) Merging driver-core.current/driver-core-linus (722e5f2b1eec driver core: Pa= rtially revert "driver core: correct device's shutdown order") Merging tty.current/tty-linus (021c91791a5e Linux 4.18-rc3) Merging usb.current/usb-linus (249a32b7eeb3 usb: core: handle hub C_PORT_OV= ER_CURRENT condition) Merging usb-gadget-fixes/fixes (eec24f2a0d4d usb: gadget: f_uac2: fix endia= nness of 'struct cntrl_*_lay3') Merging usb-serial-fixes/usb-linus (9d3cce1e8b85 Linux 4.18-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: A= lways build ULPI code) Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used = for status lines) Merging staging.current/staging-linus (b96fba8d5855 staging: speakup: fix w= raparound in uaccess length check) Merging char-misc.current/char-misc-linus (9d3cce1e8b85 Linux 4.18-rc5) Merging input-current/for-linus (384cf4285b34 Input: i8042 - add Lenovo LaV= ie Z to the i8042 reset list) Merging crypto-current/master (46d8c4b28652 crypto: padlock-aes - Fix Nano = workaround data corruption) Merging ide/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.o= rg/pub/scm/linux/kernel/git/abelloni/linux) Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre = v1) Merging kselftest-fixes/fixes (ce397d215ccd Linux 4.18-rc1) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wr= ong module .text address) Merging slave-dma-fixes/fixes (1e4b044d2251 Linux 4.18-rc4) Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1) Merging mtd-fixes/master (aa7eee8a143a mtd: spi-nor: cadence-quadspi: Fix d= irect mode write timeouts) Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode = check) Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) Merging mfd-fixes/for-mfd-fixes (ce397d215ccd Linux 4.18-rc1) Merging v4l-dvb-fixes/fixes (92cab799bbc6 media: bpf: ensure bpf program is= freed on detach) Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writi= ng bits as 0) Merging mips-fixes/mips-fixes (bc88ad2efd11 MIPS: ath79: fix register addre= ss in ath79_ddr_wb_flush()) Merging omap-fixes/fixes (d3f6daede246 ARM: dts: omap4-droid4: fix dts w.r.= t. pwm) Merging kvm-fixes/master (63aff65573d7 kvm: x86: vmx: fix vpid leak) Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check = for the itdba) Merging hwmon-fixes/hwmon (1e4b044d2251 Linux 4.18-rc4) Merging nvdimm-fixes/libnvdimm-fixes (ee6581ceba7f nfit: fix unchecked dere= ference in acpi_nfit_ctl) Merging btrfs-fixes/next-fixes (0b7162742121 Merge branch 'for-next-current= -v4.18-20180717' into next-fixes) Merging vfs-fixes/fixes (9ba546c01976 aio: don't expose __aio_sigset in uap= i) Merging dma-mapping-fixes/for-linus (7ec916f82c48 Revert "iommu/intel-iommu= : Enable CONFIG_DMA_DIRECT_OPS=3Dy and clean up intel_{alloc,free}_coherent= ()") Merging drivers-x86-fixes/fixes (9d3cce1e8b85 Linux 4.18-rc5) Merging samsung-krzk-fixes/fixes (ce397d215ccd Linux 4.18-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (ce397d215ccd Linux 4.18-rc1) Merging devicetree-fixes/dt/linus (b9952b5218ad of: overlay: update phandle= cache on overlay apply and remove) Merging scsi-fixes/fixes (b4146c4929ef scsi: qla2xxx: Return error when TMF= returns) Merging drm-fixes/drm-fixes (02e546eaccea Merge branch 'linux-4.18' of git:= //github.com/skeggsb/linux into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (0ca9488193e6 drm/i915/glk: Ad= d Quirk for GLK NUC HDMI port issues.) Merging mmc-fixes/fixes (3b1074bf9817 mmc: mxcmmc: Fix missing parentheses = and brace) Merging rtc-fixes/rtc-fixes (fd6792bb022e rtc: fix alarm read and set offse= t) Merging drm-misc-fixes/for-linux-next-fixes (a6a00918d4ad drm/vc4: Reset ->= {x, y}_scaling[1] when dealing with uniplanar formats) Merging kbuild/for-next (b58cdae8ce3f Merge branch 'kconfig' into for-next) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file nam= e contains address) Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) Merging dma-mapping/for-next (ff33d1030a6c OF: Don't set default coherent D= MA mask) Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to rem= ove barriers) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (52e19c3c1eaf Merge branches 'clkdev', 'fixes', 'misc'= and 'spectre' into for-next) Merging arm-perf/for-next/perf (06060ea7fb5b drivers/perf: hisi: update the= sccl_id/ccl_id when MT is supported) Merging arm-soc/for-next (17f076bc11e5 ARM: Document merges) Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into ne= xt) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) Merging amlogic/for-next (47a99ae970bb Merge branch 'v4.19/dt64' into tmp/a= ml-rebuild) Merging aspeed/for-next (c224edaa4a46 Merge branches 'defconfig-for-v4.19' = and 'dt-for-v4.19' into for-next) Merging at91/at91-next (f45853da06e3 Merge tag 'at91-ab-4.19-soc' of git://= git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) Merging bcm2835/for-next (5997adb14985 Merge branch anholt/bcm2835-defconfi= g-64-next into for-next) CONFLICT (content): Merge conflict in drivers/hwmon/Kconfig CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c Merging imx-mxs/for-next (7586f152bcad Merge branch 'imx/defconfig' into fo= r-next) Merging keystone/next (ed3bf0f321b9 Merge branch 'for_4.19/drivers-soc' int= o next) Merging mediatek/for-next (b75253e66bc5 Merge branch 'v4.18-next/soc' into = for-next) Merging mvebu/for-next (23b7c60b80f6 Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (d356801075c5 Merge branch 'omap-for-v4.19/dt' into f= or-next) Merging reset/reset/next (d903779b58be reset: meson: add meson audio arb dr= iver) Merging qcom/for-next (76b9e7f947f1 Merge tag 'qcom-defconfig-for-4.19' int= o all-for-4.19) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (7e58fb78c672 Merge branches 'fixes-for-v4.18', 'arm-d= efconfig-for-v4.19', 'arm-soc-for-v4.19', 'arm-dt-for-v4.19', 'arm64-defcon= fig-for-v4.19', 'arm64-dt-for-v4.19' and 'dt-bindings-for-v4.19' into next) Merging rockchip/for-next (ed8fcd5d1466 Merge branch 'v4.19-armsoc/dts64' i= nto for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (babb70ce9674 Merge branch 'next/soc' into fo= r-next) Merging sunxi/sunxi/for-next (51c756fe7803 Merge branch 'sunxi/dt64-for-4.1= 9' into sunxi/for-next) Merging tegra/for-next (f29cfb31cf00 Merge branch for-4.19/arm64/dt into fo= r-next) Merging arm64/for-next/core (0b3e336601b8 arm64: Add support for STACKLEAK = gcc plugin) CONFLICT (content): Merge conflict in arch/arm64/Makefile Merging clk/clk-next (a4673ae5194a Merge branch 'clk-allwinner' into clk-ne= xt) Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .= drvdata) Merging c6x/for-linux-next (31b02fe54206 c6x: switch to NO_BOOTMEM) Merging h8300/h8300-next (54692056a201 h8300: Correct signature of test_bit= ()) Merging m68k/for-next (cd629147324c m68k/defconfig: Update defconfigs for v= 4.18-rc1) Merging m68knommu/for-next (8aea73ec2077 m68knommu: Fix typos in Coldfire 5= 272 DMA debug code) Merging microblaze/next (0fbe9a245c60 microblaze: add endianness options to= LDFLAGS instead of LD) Merging mips/mips-next (d4da0e97baea MIPS: WARN_ON invalid DMA cache mainte= nance, not BUG_ON) CONFLICT (content): Merge conflict in arch/mips/kernel/process.c Merging nds32/next (d2516b16bcbc nds32: fix logic for module) Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() i= nstead of read_persistent_clock()) Merging openrisc/for-next (ae15a41a6414 openrisc: entry: Fix delay slot exc= eption detection) Merging parisc-hd/for-next (ce397d215ccd Linux 4.18-rc1) Merging powerpc/next (cca3d5290ede tty: hvc: remove unexplained "just in ca= se" spin delay) CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_spapr_tce.c Merging hvc/topic/hvc (9f65b81f36e3 tty: hvc: introduce the hv_ops.flush op= eration for hvc drivers) Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_= device) Merging risc-v/for-next (d72e90f33aa4 Linux 4.18-rc6) Merging s390/features (6eedfaac712d s390: reenable gcc plugins) Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.k= ernel.org/pub/scm/linux/kernel/git/abelloni/linux) Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options) Merging xtensa/xtensa-for-next (cb6db64ef5a9 Merge branch 'xtensa-dma-fixes= ' into xtensa-for-next) Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm impl= ementations) Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding stan= dard issues) Merging btrfs/next (29dcea88779c Linux 4.17) Merging btrfs-kdave/for-next (2e68fcb12d4e Merge branch 'for-next-next-v4.1= 9-20180724' into for-next-20180724) Merging ceph/master (8b8f53af1ed9 ceph: fix dentry leak in splice_dentry()) Merging cifs/for-next (771d1f7d68aa SMB3: Number of requests sent should be= displayed for SMB3 not just CIFS) Merging configfs/for-next (cc57c07343bd configfs: fix registered group remo= val) Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion b= ugs) Merging ext3/for_next (6aee47d7f61e Pull in fsnotify cleanups from Amir and= new inotify IN_MASK_CREATE flag support.) Merging ext4/dev (f4a79b7b4ab5 ext4: fix warning message in ext4_enable_quo= tas()) Merging f2fs/dev (6125eb7b79e3 f2fs: restrict setting up inode.i_advise) Merging fuse/for-next (963545357202 fuse: reduce allocation size for splice= _write) Merging jfs/jfs-next (bd646104ac5a jfs: use time64_t for otime) Merging nfs/linux-next (7b0df92ac121 pNFS/flexfiles: Process writeback rese= nds from nfsiod context as well) Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point c= rashes) Merging nfsd/nfsd-next (32620db998a5 NFSD stop ongoing async copies on clie= nt shutdown) Merging orangefs/for-next (f35cf2ab06b6 orangefs: remove redundant pointer = orangefs_inode) Merging overlayfs/overlayfs-next (989974c80457 ovl: Enable metadata only fe= ature) Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual= license) Merging v9fs/9p-next (cfcde0393569 9p: validate PDU length) Merging xfs/for-next (f467cad95f5e xfs: force summary counter recalc at nex= t mount) Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by pr= ocesses from another pidns) Merging vfs/for-next (f6756d7df991 Merge branch 'work.misc' into for-next) CONFLICT (content): Merge conflict in include/linux/fs.h Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsy= nc()) Merging printk/for-next (7973c51853f8 Merge branch 'for-4.19-nmi' into for-= next) Merging pci/next (9f6a92d29b5e Merge branch 'remotes/lorenzo/pci/vmd') CONFLICT (content): Merge conflict in drivers/pci/controller/pci-aardvark.c Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencie= s without compression) Merging hid/for-next (4e9544262a93 Merge branch 'for-4.19/cougar' into for-= next) Merging i2c/i2c/for-next (c813df8f0069 Merge branch 'i2c/for-current' into = i2c/for-next) Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID st= ring) Merging hwmon-staging/hwmon-next (12005ec33f3a hwmon: (iio_hwmon) Use devm = functions) Merging jc_docs/docs-next (d1634e1aedbc Documentation: vm.txt: Adding 'nr_h= ugepages_mempolicy' parameter description.) Merging v4l-dvb/master (343b23a7c6b6 media: gpu: ipu-v3: Allow negative off= sets for interlaced scanning) Applying: Revert "media: dvb: get rid of VIDEO_SET_SPU_PALETTE" Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h= : use IS_ENABLED()) Merging fbdev/fbdev-for-next (cb782a3fa952 udlfb: use spin_lock_irq instead= of spin_lock_irqsave) Merging pm/linux-next (dd625721ced5 Merge branch 'acpi-battery' into linux-= next) Merging cpupower/cpupower (ce397d215ccd Linux 4.18-rc1) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (c5c2a97b3ac7 PM / OPP: Update voltage in case f= req =3D=3D old_freq) Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'therm= al-intel' into next) Merging thermal-soc/next (ad41e5f92b93 dt-bindings: thermal: armada: add re= ference to new bindings) Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversize= d DMA reads on JMicron controllers) Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_= to_sock) Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check conditi= on for xen_swiotlb_free_coherent) Merging rdma/for-next (ed288d74a9e5 net/xprtrdma: Simplify ib_post_(send|re= cv|srq_recv)() calls) CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c Merging net-next/master (6a8fab17940d Merge branch '10GbE' of git://git.ker= nel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) CONFLICT (content): Merge conflict in tools/lib/bpf/btf.h CONFLICT (content): Merge conflict in tools/lib/bpf/btf.c CONFLICT (content): Merge conflict in net/smc/smc_ib.c CONFLICT (content): Merge conflict in net/smc/smc_core.c CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Applying: net/smc: fixups for ip_query_gid API removal Merging bpf-next/master (9778cfdfc9d9 samples/bpf: Add BTF build flags to M= akefile) Merging ipsec-next/master (5baf4f9c0035 xfrm: Allow xfrmi if_id to be updat= ed by UPDSA) Merging mlx5-next/mlx5-next (664000b6bb43 net/mlx5: Add support for flow ta= ble destination number) Merging netfilter-next/master (0a78c3803d19 net: mediatek: use dma_zalloc_c= oherent instead of allocator/memset) Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warning= s) Merging ipvs-next/master (66c524acfb51 netfilter: conntrack: remove l3proto= abstraction) CONFLICT (content): Merge conflict in net/netfilter/Makefile CONFLICT (content): Merge conflict in net/netfilter/Kconfig CONFLICT (content): Merge conflict in net/ipv6/netfilter/Kconfig Merging wireless-drivers-next/master (bf9b608e63df Merge ath-next from git:= //git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging bluetooth/master (25a13e382de2 bluetooth: hci_qca: Replace GFP_ATOM= IC with GFP_KERNEL) Merging mac80211-next/master (133bf90dbb8b mac80211: restrict delayed tailr= oom needed decrement) Merging gfs2/for-next (3f30f929bb17 gfs2: cleanup: call gfs2_rgrp_ondisk2lv= b from gfs2_rgrp_out) Merging mtd/mtd/next (76a832254ab0 mtd: partitions: use DT info for parsing= partitions with "compatible" prop) Merging nand/nand/next (237b81c9dc2d MAINTAINERS: drop Wenyou Yang from Atm= el NAND driver support) Merging spi-nor/spi-nor/next (2c797c0f0870 mtd: spi-nor: intel-spi: use mtd= _device_register()) Merging crypto/master (0e7d4d932ffc crypto: sharah - Unregister correct alg= orithms for SAHARA 3) Merging drm/drm-next (6d52aacd92c6 Merge branch 'drm-next-4.19' of git://pe= ople.freedesktop.org/~agd5f/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/ipu-v3/ipu-cpmem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/smumgr/= smu7_smumgr.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/inc/dc= _link_ddc.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce/dc= e_mem_input.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/d= c_link_ddc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm= /amdgpu_dm_services.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm= /amdgpu_dm_mst_types.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_acp= i.c Applying: drm/i915/kvmgt: merge fixup for "Check the pfn got from vfio_pin_= pages" Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add s= upport for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (6dc17d69f83e drm/i915/selftests: Exercise= resetting in the middle of a wait-on-fence) Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc= for UAPI) Merging drm-misc/for-linux-next (5e03f02cb58d dt-bindings: mipi-dsi: Add du= al-channel DSI related info) Merging drm-msm/msm-next (65fe1dd47c73 drm/msm: Replace PTR_RET with PTR_ER= R_OR_ZERO) Merging hdlcd/for-upstream/hdlcd (ce40d096e8ce drm/arm/hdlcd: Reject atomic= commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (e368fc75c190 drm/arm/malidp: Added th= e late system pm functions) Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/dr= m-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) Merging imx-drm/imx-drm/next (81f2b25addde drm/imx: Remove unused field imx= _drm_device.pipes) Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license tex= t with SPDX tags) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (0bf0f09cc45b Merge branch 'regmap-4.19' into regma= p-next) Merging sound/for-next (d6b340d7cb33 ALSA: trident: Suppress gcc string war= ning) Merging sound-asoc/for-next (75fca014051b Merge branch 'asoc-4.19' into aso= c-next) Merging modules/modules-next (4d58e7034d19 ARM: module: fix modsign build e= rror) Merging input/next (305180bc0501 Input: iforce - reformat the packet dump o= utput) Merging block/for-next (5bce18b18b25 Merge branch 'for-4.19/block' into for= -next) CONFLICT (content): Merge conflict in drivers/nvme/target/rdma.c Applying: nvme-dma: merge fix up for replacement of max_sge Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pb= lk-init.c) Merging device-mapper/for-next (f88a3f746ff0 dm thinp: update stale "status= " Documentation) Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver f= or scsi drivers) Merging mmc/next (44350993d01c mmc: tegra: Add and use tegra_sdhci_get_max_= clock()) Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlappin= g memcpy) Merging md/for-next (08edaaa6d6fa drivers/md/raid5: Do not disable irq on r= elease_inactive_stripe_list() call) Merging mfd/for-mfd-next (99266311865e mfd: axp20x: Support AXP806 in I2C m= ode) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig Merging backlight/for-backlight-next (633786736ed5 backlight: pwm_bl: Fix u= ninitialized variable) Merging battery/for-next (3d779180c692 power: supply: bq27xxx: Update comme= nts) Merging regulator/for-next (56d7a96ea500 Merge branch 'regulator-4.19' into= regulator-next) Merging security/next-testing (f98b52429135 Merge branch 'next-integrity' i= nto next-testing) Merging apparmor/apparmor-next (24b87a16fee0 apparmor: Fix failure to audit= context info in build_change_hat) Merging integrity/next-integrity (3dd0f18c70d9 EVM: fix return value check = in evm_write_xattrs()) Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to preve= nt tainting) Merging selinux/next (631d2b490569 selinux: constify write_op[]) Merging tpmdd/next (776afd171925 ima: Get rid of ima_used_chip and use ima_= tpm_chip !=3D NULL instead) Merging watchdog/master (9d3cce1e8b85 Linux 4.18-rc5) Merging iommu/next (a8cfa7c8491c Merge branches 'iommu/fixes', 'arm/shmobil= e', 'arm/renesas', 'arm/msm', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (c1abca96b252 samples: mbochs: add DMA_SHARED_BUFFER depe= ndency) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (baa2a4fdd525 audit: fix use-after-free in audit_add_wat= ch) Merging devicetree/for-next (791d3ef2e111 dt-bindings: remove 'interrupt-pa= rent' from bindings) Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consol= idate the Kconfig for the MAILBOX) Merging spi/for-next (532d9fa650d6 Merge branch 'spi-4.19' into spi-next) Merging tip/auto-latest (91a1c5a1b666 Merge branch 'x86/urgent') Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_= timer: Add comments about locking while read GFRC) Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/bp/bp) Merging edac-amd/for-next (190bd6e98afc EDAC, sb_edac: Add support for syst= ems with segmented PCI buses) Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti su= pport to stm32mp157 pinctrl) Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment) Merging rcu/rcu/next (d57fa29ddc3c Merge LKMM and RCU commits) CONFLICT (content): Merge conflict in kernel/sched/core.c Merging kvm/linux-next (6f0d349d922b Merge git://git.kernel.org/pub/scm/lin= ux/kernel/git/davem/net) Merging kvm-arm/next (6b8b9a48545e KVM: arm/arm64: vgic: Fix possible spect= re-v1 write in vgic_mmio_write_apr()) CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpucaps.h Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement T= LBR for T&E) Merging kvm-ppc/kvm-ppc-next (b5c6f7607b90 KVM: PPC: Book3S HV: Read kvm->a= rch.emul_smt_mode under kvm->lock) Merging kvms390/next (a3da7b4a3be5 KVM: s390: add etoken support for guests) Merging xen-tip/linux-next (0ce0bba4e5e0 xen: setup pv irq ops vector earli= er) Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade us= ers from depending on internal RCU grace periods) Merging workqueues/for-next (66448bc274ca workqueue: move function definiti= ons within CONFIG_SMP block) Merging drivers-x86/for-next (c2e2a618eb71 platform/x86: toshiba_acpi: Fix = defined but not used build warnings) Merging chrome-platform/for-next (40291fb75123 Merge tag 'ib-platform-chrom= e-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19) Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1) Merging leds/for-next (6f7b0bad8839 usb: simplify usbport trigger) Merging ipmi/for-next (a4fb7ddc6356 ipmi: kcs_bmc: don't change device name) Merging driver-core/driver-core-next (e16f4f3e0b7d base: core: Remove WARN_= ON from link dependencies check) CONFLICT (content): Merge conflict in fs/sysfs/group.c CONFLICT (content): Merge conflict in drivers/iommu/ipmmu-vmsa.c Merging usb/usb-next (60207c8ef2a3 usb: usbtmc: Add support for 32 bit comp= at applications) Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue) Merging usb-serial/usb-next (c8acfe0aadbe USB: serial: cp210x: implement GP= IO support for CP2102N) Merging usb-chipidea-next/ci-for-usb-next (ba0ab35a81de usb: chipidea: tegr= a: Use aligned DMA on Tegra114/124) Merging phy-next/next (ec14b83a1ee4 phy: mvebu-cp110-comphy: switch to SPDX= identifier) Merging tty/tty-next (286d9b8c7d2e serial: 8250: Use cached port name direc= tly in messages) Merging char-misc/char-misc-next (2d8ff0b586fb thunderbolt: Add support for= runtime PM) Merging extcon/extcon-next (8a9dbb779fe8 extcon: Release locking when sendi= ng the notification of connector state) Merging staging/staging-next (3ceefa3ffd17 Merge tag 'iio-for-4.19b' of git= ://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) CONFLICT (modify/delete): drivers/staging/skein/skein_generic.c deleted in = staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/= skein/skein_generic.c left in tree. CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio= /pressure/bmp085.txt $ git rm -f drivers/staging/skein/skein_generic.c Applying: Revert "Revert "staging:r8188eu: Use lib80211 to support TKIP"" Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API) Merging slave-dma/next (b7db3a245876 Merge branch 'topic/pl330' into next) Merging cgroup/for-next (e4f8d81c738d cgroup/tracing: Move taking of spin l= ock out of trace event handlers) Merging scsi/for-next (d92f5db64445 Merge branch 'misc' into for-next) CONFLICT (modify/delete): lib/percpu_ida.c deleted in scsi/for-next and mod= ified in HEAD. Version HEAD of lib/percpu_ida.c left in tree. CONFLICT (content): Merge conflict in MAINTAINERS $ git rm -f lib/percpu_ida.c Merging scsi-mkp/for-next (f4e34f2a5dd9 scsi: hisi_sas: Add SATA FIS check = for v3 hw) Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wa= ke up sleeping login worker) Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) Merging libata/for-next (b6caca4a4371 Merge branch 'for-4.19' into for-next) Applying: Revert "ata: ahci_platform: allow disabling of hotplug to save po= wer" Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for tran= sport features) Merging rpmsg/for-next (3d065621c921 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (8387c0a88e23 Merge branch 'devel' into for-next) Merging pinctrl/for-next (c1112e6299ce Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (b3793159249b dt-bindings: pinctrl: samsun= g: Add SPDX license identifier) Merging pwm/for-next (19ad2b75c643 pwm: mxs: Switch to SPDX identifier) Merging userns/for-next (04035aa33a12 proc: Don't change mount options on r= emount failure.) CONFLICT (content): Merge conflict in fs/proc/root.c CONFLICT (content): Merge conflict in fs/proc/internal.h CONFLICT (content): Merge conflict in fs/proc/inode.c Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for g= rub2 menus) Merging random/dev (b34fbaa92893 random: remove preempt disabled region) Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and c= ounting against aio-max-nr) Merging kselftest/next (d2d49495b5c0 selftests: vDSO - fix to return KSFT_S= KIP when test couldn't be run) Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string defini= tion) Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream= ' into for-next) Merging coresight/next (1f0a504d39ae coresight: tpiu: Fix disabling timeout= s) Merging rtc/rtc-next (c842697c741e rtc: unexport rtc_irq_set_*) Merging nvdimm/libnvdimm-for-next (d6af4b07ab95 Merge branch 'for-4.19/dax-= memory-failure' into libnvdimm-for-next) CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c Merging at24/at24/for-next (a2b3bf4846e5 eeprom: at24: Add support for addr= ess-width property) Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch) Merging kspp/for-next/kspp (34c837a11879 Merge branch 'for-next/gcc-plugins= ' into for-next/kspp) $ git reset --hard HEAD^ Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging cisco/for-next (ce397d215ccd Linux 4.18-rc1) Merging xarray/xarray (f039e3979325 radix tree: Remove radix_tree_clear_tag= s) CONFLICT (content): Merge conflict in MAINTAINERS Merging fsi/master (9840fcd8cc43 fsi: Prevent multiple concurrent rescans) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging ida/ida (d69dd7ae5cd8 ida: Convert to XArray) Applying: net: hns: make hns_dsaf_roce_reset() not static Merging akpm-current/current (675ee9c7aff3 ipc/util.c: update return value = of ipc_getref from int to bool) CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c CONFLICT (content): Merge conflict in include/linux/bitops.h CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile Applying: fixup for bit.h/bitops.h merge $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t Applying: fs/nfs/file.c: use new return type vm_fault_t Applying: fs/afs: use new return type vm_fault_t Applying: treewide: correct "differenciate" and "instanciate" typos Applying: fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds Applying: drivers/gpu/drm/gma500/: change return type to vm_fault_t Applying: treewide: convert ISO_8859-1 text comments to utf-8 Applying: s390: ebcdic: convert comments to UTF-8 Applying: lib/fonts: convert comments to utf-8 Applying: mm: Change return type int to vm_fault_t for fault handlers Applying: mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix Applying: vfs: replace current_kernel_time64 with ktime equivalent Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer ove= rflow Merging akpm/master (5ec9881df04c drivers/media/platform/sti/delta/delta-ip= c.c: fix read buffer overflow) --Sig_/7/Zs9EkhTWXGl=nVr.N1lyu Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAltbAzQACgkQAVBC80lX 0Gyqpgf/UV07Uy+CdbN110+y7/eSoQ6xdQn8e8uGlHE/lUjxxEJourW1G05UiaVk E1QixASctTF8EzBXI5NEttEtGaV2jPPOP2f3KYzDeOr1/i4O1qEAbsvP8MxOFp02 w0auoGnASlGtxm5wnejx5Grs4a3jQEulhdqtuPQfLA15W/MwwPMLyJz/UOkSk/bg mQqENuX4tH/NA7L1MygqCxhiZLX1sbV3IoYzyU4ZUQurG33V+YTMKN8C7HB6qkPA Znq36+XYJTWhK05W99u/KyJ3pJEKk/gCJ92/wJUdIoD9wK+RDVcHvBFgMZ/W7V0o ssPh6HVDCijMbuSHFF9yFioIWBihJg== =krgF -----END PGP SIGNATURE----- --Sig_/7/Zs9EkhTWXGl=nVr.N1lyu--