linux-next: Tree for Jul 25

* linux-next: Tree for Jul 25
@ 2018-07-25  6:44 Stephen Rothwell
  2018-07-25 13:32 ` Guenter Roeck
  2018-07-25 15:55 ` linux-next: Tree for Jul 25 (netfilter) Randy Dunlap
  0 siblings, 2 replies; 3+ messages in thread
From: Stephen Rothwell @ 2018-07-25  6:44 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 32279 bytes --]

Hi all,

Changes since 20180724:

Dropped trees: xarray, ida (complex conflicts)

The xarray tree still had its complex conflicts against the nvdimm tree
so I have dropped it again for today (along with the ida tree that is
built on top of it).

The akpm-current tree still had its build failure for which I reverted
a commit.

Non-merge commits (relative to Linus' tree): 8119
 7489 files changed, 334256 insertions(+), 150745 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.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (f89ed2f880cc Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.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 kernel memory back to read-only after boot)
Merging arm64-fixes/for-next/fixes (2fd8eb4ad871 arm64: neon: Fix function may_use_simd() return error status)
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 (18041b523692 r8169: restore previous behavior to accept BIOS WoL settings)
Merging bpf/master (6283fa38dc87 bpf: btf: Ensure the member->offset is in the right order)
Merging ipsec/master (7284fdf39a91 esp6: fix memleak on error path in esp6_input)
Merging netfilter/master (049f56044d12 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (0026129c8629 rhashtable: add restart routine in rhashtable_free_and_destroy())
Merging wireless-drivers/master (144fe2bfd236 sock: fix sg page frag coalescing in sk_alloc_sg)
Merging mac80211/master (e31f6456c01c cfg80211: never ignore user regulatory hint)
Merging rdma-fixes/for-rc (d63c46734c54 RDMA/mlx5: Fix memory leak in mlx5_ib_create_srq() error path)
Merging sound-current/for-linus (dfef01e15082 ALSA: memalloc: Don't exceed over the requested size)
Merging sound-asoc-fixes/for-linus (01b3dfa7153c Merge branch 'asoc-4.18' into asoc-linus)
Merging regmap-fixes/for-linus (d72e90f33aa4 Linux 4.18-rc6)
Merging regulator-fixes/for-linus (3db3eff91bed Merge branch 'regulator-4.18' into regulator-linus)
Merging spi-fixes/for-linus (6de17910611a Merge branch 'spi-4.18' into spi-linus)
Merging pci-current/for-linus (270ed733e689 PCI: v3-semi: Fix I/O space page leak)
Merging driver-core.current/driver-core-linus (722e5f2b1eec driver core: Partially 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_OVER_CURRENT condition)
Merging usb-gadget-fixes/fixes (eec24f2a0d4d usb: gadget: f_uac2: fix endianness 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: Always 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 wraparound 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 LaVie 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.org/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 wrong 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 direct 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 (0ca54b290541 media: rc: be less noisy when driver misbehaves)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
Merging mips-fixes/mips-fixes (bc88ad2efd11 MIPS: ath79: fix register address 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 dereference 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 uapi)
Merging dma-mapping-fixes/for-linus (7ec916f82c48 Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y 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 (d72e90f33aa4 Linux 4.18-rc6)
Merging mmc-fixes/fixes (3b1074bf9817 mmc: mxcmmc: Fix missing parentheses and brace)
Merging rtc-fixes/rtc-fixes (fd6792bb022e rtc: fix alarm read and set offset)
Merging drm-misc-fixes/for-linux-next-fixes (d530b5f1ca0b drm: re-enable error handling)
Merging kbuild/for-next (d5a57dff2213 Merge branch 'kconfig' into for-next)
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask)
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove 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 (c13207905340 arm64: perf: Add support for chaining event counters)
Merging arm-soc/for-next (b2df9d609df1 ARM: Document merges)
Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (471ea3399607 Merge branch 'v4.19/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (403d991cce7d 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-defconfig-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 for-next)
Merging keystone/next (ed3bf0f321b9 Merge branch 'for_4.19/drivers-soc' into 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/for-next)
Merging omap/for-next (d356801075c5 Merge branch 'omap-for-v4.19/dt' into for-next)
Merging reset/reset/next (d903779b58be reset: meson: add meson audio arb driver)
Merging qcom/for-next (76b9e7f947f1 Merge tag 'qcom-defconfig-for-4.19' into 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-defconfig-for-v4.19', 'arm-soc-for-v4.19', 'arm-dt-for-v4.19', 'arm64-defconfig-for-v4.19', 'arm64-dt-for-v4.19' and 'dt-bindings-for-v4.19' into next)
Merging rockchip/for-next (75589311007d Merge branch 'v4.19-armsoc/dts64' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (babb70ce9674 Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (51c756fe7803 Merge branch 'sunxi/dt64-for-4.19' into sunxi/for-next)
Merging tegra/for-next (f29cfb31cf00 Merge branch for-4.19/arm64/dt into for-next)
Merging arm64/for-next/core (b965746306bc rseq/selftests: Add support for arm64)
CONFLICT (content): Merge conflict in arch/arm64/Makefile
Merging clk/clk-next (4db3ff7a7f11 Merge branch 'clk-qcom-rpmh' into clk-next)
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 v4.18-rc1)
Merging m68knommu/for-next (8aea73ec2077 m68knommu: Fix typos in Coldfire 5272 DMA debug code)
Merging microblaze/next (ed207a743444 microblaze: remove consistent_sync and consistent_sync_page)
Merging mips/mips-next (93e01942a6eb MIPS: Hardcode cpu_has_* where known at compile time due to ISA)
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() instead of read_persistent_clock())
Merging openrisc/for-next (ae15a41a6414 openrisc: entry: Fix delay slot exception detection)
Merging parisc-hd/for-next (ce397d215ccd Linux 4.18-rc1)
Merging powerpc/next (cca3d5290ede tty: hvc: remove unexplained "just in case" 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 operation 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 (ef4b891f7924 s390: vdso_fault return type)
Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.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 implementations)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (2e68fcb12d4e Merge branch 'for-next-next-v4.19-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 removal)
Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs)
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_quotas())
Merging f2fs/dev (a5e028bee784 f2fs: fix to do sanity check with inline flags)
Merging fuse/for-next (8139306548ab fuse: convert last timespec use to timespec64)
Merging jfs/jfs-next (bd646104ac5a jfs: use time64_t for otime)
Merging nfs/linux-next (7b0df92ac121 pNFS/flexfiles: Process writeback resends from nfsiod context as well)
Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes)
Merging nfsd/nfsd-next (32620db998a5 NFSD stop ongoing async copies on client shutdown)
Merging orangefs/for-next (f35cf2ab06b6 orangefs: remove redundant pointer orangefs_inode)
Merging overlayfs/overlayfs-next (989974c80457 ovl: Enable metadata only feature)
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 next mount)
Merging file-locks/locks-next (1cf8e5de4055 fs/lock: show locks taken by processes 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->fsync())
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 dependencies 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 string)
Merging hwmon-staging/hwmon-next (12005ec33f3a hwmon: (iio_hwmon) Use devm functions)
Merging jc_docs/docs-next (fe3136f44141 mm: Introduce new type vm_fault_t)
Merging v4l-dvb/master (231783073ebf media: v4l: rcar_fdp1: Enable compilation on Gen2 platforms)
Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED())
Merging fbdev/fbdev-for-next (88fe4ceb2447 efifb: BGRT: Do not copy the boot graphics for non native resolutions)
Merging pm/linux-next (6012bb618f93 Merge branch 'acpi-property' 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 freq == old_freq)
Merging thermal/next (e9ed3ee61aa6 Merge branches 'thermal-core' and 'thermal-intel' into next)
Merging thermal-soc/next (1d32d387967c thermal: ti-soc-thermal: remove dead code)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized 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 condition for xen_swiotlb_free_coherent)
Merging rdma/for-next (c012691508f5 IB/cm: Remove cma_multicast->igmp_joined)
CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c
Merging net-next/master (aea5f654e6b7 net/sched: add skbprio scheduler)
CONFLICT (content): Merge conflict in net/smc/smc_ib.c
Merging bpf-next/master (fd800f646402 wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc)
Merging ipsec-next/master (5baf4f9c0035 xfrm: Allow xfrmi if_id to be updated by UPDSA)
Merging mlx5-next/mlx5-next (664000b6bb43 net/mlx5: Add support for flow table destination number)
Merging netfilter-next/master (0a78c3803d19 net: mediatek: use dma_zalloc_coherent instead of allocator/memset)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
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 (a527d3f728bf Merge tag 'wireless-drivers-next-for-davem-2018-07-23' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
Merging bluetooth/master (25a13e382de2 bluetooth: hci_qca: Replace GFP_ATOMIC with GFP_KERNEL)
Merging mac80211-next/master (133bf90dbb8b mac80211: restrict delayed tailroom needed decrement)
Merging gfs2/for-next (f6753df35c32 GFS2: rgrp free blocks used incorrectly)
Merging mtd/mtd/next (8c15e21c3508 mtd: lpddr: use mtd_device_register())
Merging nand/nand/next (db4a671e39ff mtd: rawnand: add hooks that may be called during nand_scan())
Merging spi-nor/spi-nor/next (2c797c0f0870 mtd: spi-nor: intel-spi: use mtd_device_register())
Merging crypto/master (0e7d4d932ffc crypto: sharah - Unregister correct algorithms for SAHARA 3)
Merging drm/drm-next (500775074f88 Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next)
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/dce_mem_input.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_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
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 support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (07685c827b2a drm/i915/icl: Implement voltage swing programming sequence for MG PHY DDI)
Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI)
Merging drm-misc/for-linux-next (0305189afb32 drm/sun4i: tcon: Add support for R40 TCON)
Merging drm-msm/msm-next (010148c5b155 drm/msm: rework vblank event handling in dpu_crtc)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dsi/dsi_manager.c
Applying: drm: msm: merge fix for drm_plane_helper_disable() API change
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 the late system pm functions)
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-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 text with SPDX tags)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (0bf0f09cc45b Merge branch 'regmap-4.19' into regmap-next)
Merging sound/for-next (f9b54e1961c7 ALSA: hda/i915: Allow delayed i915 audio component binding)
Merging sound-asoc/for-next (5c5661c29f3c Merge branch 'asoc-4.19' into asoc-next)
Merging modules/modules-next (4d58e7034d19 ARM: module: fix modsign build error)
Merging input/next (2b6e68119c47 Input: gpio_keys - add missing include to gpio_keys.h)
Merging block/for-next (e07b5f495e84 Merge branch 'for-4.19/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (f88a3f746ff0 dm thinp: update stale "status" Documentation)
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for 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 overlapping memcpy)
Merging md/for-next (08edaaa6d6fa drivers/md/raid5: Do not disable irq on release_inactive_stripe_list() call)
Merging mfd/for-mfd-next (99266311865e mfd: axp20x: Support AXP806 in I2C mode)
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 (858c5dfc8c33 backlight: adp8860: Mark expected switch fall-through)
Merging battery/for-next (3d779180c692 power: supply: bq27xxx: Update comments)
Merging regulator/for-next (56d7a96ea500 Merge branch 'regulator-4.19' into regulator-next)
Merging security/next-testing (f98b52429135 Merge branch 'next-integrity' into 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 prevent 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 != NULL instead)
Merging watchdog/master (9d3cce1e8b85 Linux 4.18-rc5)
Merging iommu/next (a8cfa7c8491c Merge branches 'iommu/fixes', 'arm/shmobile', '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 dependency)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (baa2a4fdd525 audit: fix use-after-free in audit_add_watch)
Merging devicetree/for-next (3a6372daddeb dt-bindings: sound: wm8994: document wlf,csnaddr-pd property)
Merging mailbox/mailbox-for-next (f83d1cfc8bcd mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX)
Merging spi/for-next (1f382d2c76b8 Merge branch 'spi-4.19' into spi-next)
Merging tip/auto-latest (06e3738aa45b 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://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (6663484b4e2d EDAC, thunderx: Remove VLA usage)
Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl)
Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment)
Merging rcu/rcu/next (d57fa29ddc3c Merge LKMM and RCU commits)
Merging kvm/linux-next (6f0d349d922b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kvm-arm/next (6b8b9a48545e KVM: arm/arm64: vgic: Fix possible spectre-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 TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (0abb75b7a16d KVM: PPC: Book3S HV: Fix constant size warning)
Merging kvms390/next (a3da7b4a3be5 KVM: s390: add etoken support for guests)
Merging xen-tip/linux-next (0ce0bba4e5e0 xen: setup pv irq ops vector earlier)
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods)
Merging workqueues/for-next (66448bc274ca workqueue: move function definitions 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-chrome-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 (12dcaeb77e67 usb: usbtmc: Add ioctl for termination character)
Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue)
Merging usb-serial/usb-next (c8acfe0aadbe USB: serial: cp210x: implement GPIO support for CP2102N)
Merging usb-chipidea-next/ci-for-usb-next (ba0ab35a81de usb: chipidea: tegra: Use aligned DMA on Tegra114/124)
Merging phy-next/next (ec14b83a1ee4 phy: mvebu-cp110-comphy: switch to SPDX identifier)
Merging tty/tty-next (b340cbbea5b8 serial: 8250_exar: Drop unused variable in pci_xr17v35x_setup())
Merging char-misc/char-misc-next (bce5c2ea350f uio: add SPDX license tags)
Merging extcon/extcon-next (8a9dbb779fe8 extcon: Release locking when sending the notification of connector state)
Merging staging/staging-next (9005feae4785 staging: rtl8712: remove redundant pointer 'nic')
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.
$ 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 (e1966eb8a1b1 Merge branch 'topic/renesas' into next)
Merging cgroup/for-next (e4f8d81c738d cgroup/tracing: Move taking of spin lock 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 modified 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 wake 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 power"
Merging vhost/linux-next (2eb98105f8c7 virtio: update the comments for transport features)
Merging rpmsg/for-next (3d065621c921 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (8387c0a88e23 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (254e939f5234 Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (b3793159249b dt-bindings: pinctrl: samsung: 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 remount 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 grub2 menus)
Merging random/dev (b34fbaa92893 random: remove preempt disabled region)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (d2d49495b5c0 selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run)
Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition)
Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next)
Merging coresight/next (1f0a504d39ae coresight: tpiu: Fix disabling timeouts)
Merging rtc/rtc-next (7e580769b79f rtc: ds1307: support m41t11 variant)
Merging nvdimm/libnvdimm-for-next (9cacf46d5e55 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 (ce397d215ccd Linux 4.18-rc1)
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)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (ce397d215ccd Linux 4.18-rc1)
Merging xarray/xarray (4c8e6fcba165 radix tree: Remove radix_tree_clear_tags)
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in MAINTAINERS
$ git reset --hard HEAD
Merging fsi/master (d0cff240b83b fsi: master-ast-cf: Fix build warnings on 64-bit platforms)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging ida/ida (7f9e5cb90e68 ida: Convert to XArray)
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in MAINTAINERS
$ git reset --hard HEAD
Merging akpm-current/current (a4e7d4dfafca mm, vmacache: hash addresses based on pmd fix)
CONFLICT (content): Merge conflict in mm/mmap.c
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
CONFLICT (content): Merge conflict in include/linux/sched.h
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
Applying: fixup for bit.h/bitops.h merge
Applying: Revert "proc/kcore: add vmcoreinfo note to /proc/kcore"
$ 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: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (3a4f5ce74769 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread