Hi all,

News: I will not be doing any linux-next releases between Friday 18 May
and Friday 25 May inclusive.

Changes since 20180515:

New trees: samsung-krzk-fixes

The kbuild tree still had its build failure for which I applied a patch.

The mips-james tree gained a conflict against the mips-fixes tree.

The btrfs-kdave tree gained a conflict against the btrfs-fixes tree.

The drm tree gained a build failure for which I applied a patch.

Non-merge commits (relative to Linus' tree): 6994
 6647 files changed, 275138 insertions(+), 125262 deletions(-)


I have created today's linux-next tree at
(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

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 276 trees (counting Linus' and 63 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.

Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (21b9f1c7e319 Merge tag 'afs-fixes-20180514' of 
Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of 
Merging kbuild-current/fixes (75bc37fefc44 Linux 4.17-rc4)
Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4)
Merging arm-current/fixes (30cfae461581 ARM: replace unnecessary perl with sed 
and the shell $(( )) operator)
Merging arm64-fixes/for-next/fixes (0583a4ef0598 arm64: capabilities: Add 
NVIDIA Denver CPU to bp_harden list)
Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" 
Merging powerpc-fixes/fixes (6c0a8f6b5a45 powerpc/pseries: Fix CONFIG_NUMA=n 
Merging sparc/master (fff75eb2a08c Merge tag 'errseq-v4.17' of 
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (f3002c1374fb vmxnet3: use DMA memory barriers where 
Merging bpf/master (f3002c1374fb vmxnet3: use DMA memory barriers where 
Merging ipsec/master (d9f92772e8ec xfrm6: avoid potential infinite loop in 
Merging netfilter/master (9d6b4bfb59a0 Merge 
Merging ipvs/master (2f99aa31cd7a netfilter: nf_tables: skip synchronize_rcu if 
transaction log is empty)
Merging wireless-drivers/master (ebd27d3317c6 ssb: make SSB_PCICORE_HOSTMODE 
depend on SSB = y)
Merging mac80211/master (914eac248d87 mac80211: use timeout from the AddBA 
response instead of the request)
Merging rdma-fixes/for-rc (3d69191086fc iw_cxgb4: Fix an error handling path in 
Merging sound-current/for-linus (c99f0802e42f ALSA: usb-audio: Use Class 
Specific EP for UAC3 devices.)
Merging sound-asoc-fixes/for-linus (1ade2b2f9a3b Merge branch 'asoc-4.17' into 
Merging regmap-fixes/for-linus (e37563bb6c59 Merge tag 'for-4.17-part2-tag' of 
Merging regulator-fixes/for-linus (e37563bb6c59 Merge tag 'for-4.17-part2-tag' 
of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging spi-fixes/for-linus (c3317999e7ff Merge branch 'spi-4.17' into 
Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to 
pcie_print_link_status() messages)
Merging driver-core.current/driver-core-linus (6da6c0db5316 Linux v4.17-rc3)
Merging tty.current/tty-linus (6da6c0db5316 Linux v4.17-rc3)
Merging usb.current/usb-linus (22076557b07c usbip: usbip_host: fix NULL-ptr 
deref and use-after-free errors)
Merging usb-gadget-fixes/fixes (ed769520727e usb: gadget: composite Allow for 
larger configuration descriptors)
Merging usb-serial-fixes/usb-linus (75bc37fefc44 Linux 4.17-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: 
fix ulpi-node lookup)
Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1)
Merging staging.current/staging-linus (9d569b1cf7a2 Merge tag 
'iio-fixes-for-4.17a' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (dd010bd7af62 thunderbolt: Handle 
NULL boot ACL entries properly)
Merging input-current/for-linus (f6eeb9e54857 Input: atmel_mxt_ts - add missing 
compatible strings to OF device table)
Merging crypto-current/master (eea0d3ea7546 crypto: drbg - set freed buffers to 
Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time')
Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a 
device is not capabable of enabling it")
Merging kselftest-fixes/fixes (75bc37fefc44 Linux 4.17-rc4)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong 
module .text address)
Merging slave-dma-fixes/fixes (613e0bb622e7 Revert "dmaengine: pl330: add 
DMA_PAUSE feature")
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: 
fix device-tree node leaks)
Merging mtd-fixes/master (9f825e74d761 mtd: rawnand: Fix return type of 
__DIVIDE() when called with 32-bit)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode 
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during 
Merging v4l-dvb-fixes/fixes (b84c8fdf8e6c media: uvcvideo: Prevent setting 
unavailable flags)
Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock 
line for LD20)
Merging mips-fixes/mips-fixes (9a3a92ccfe36 MIPS: Fix ptrace(2) PTRACE_PEEKUSR 
and PTRACE_POKEUSR accesses to o32 FGRs)
Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix 
pinmux controller references")
Merging kvm-fixes/master (711702b57cc3 KVM: arm/arm64: VGIC/ITS save/restore: 
protect kvm_read_guest() calls)
Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites 
when not using SCA entries)
Merging hwmon-fixes/hwmon (3b031622f598 hwmon: (k10temp) Use API function to 
access System Management Network)
Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4)
Merging btrfs-fixes/next-fixes (cfef25eb5ae5 Merge branch 'misc-4.17' into 
Merging vfs-fixes/fixes (98f78eceb156 unfuck sysfs_mount())
Merging dma-mapping-fixes/for-linus (05e13bb57e6f swiotlb: silent unwanted 
warning "buffer is full")
Merging drivers-x86-fixes/fixes (7fe3fa3b5ec8 platform/x86: Kconfig: Fix 
dell-laptop dependency chain.)
Merging samsung-krzk-fixes/fixes (60cc43fc8884 Linux 4.17-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (60cc43fc8884 Linux 4.17-rc1)
Merging drm-intel-fixes/for-linux-next-fixes (c102b8014714 drm/i915/gen9: Add 
WaClearHIZ_WM_CHICKEN3 for bxt and glk)
Merging mmc-fixes/fixes (6d08b06e67cd Linux 4.17-rc2)
Merging rtc-fixes/rtc-fixes (60cc43fc8884 Linux 4.17-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (72cb0d893343 drm/vc4: Fix leak of 
the file_priv that stored the perfmon.)
Merging kbuild/for-next (2eb0d55f3627 powerpc: Allow 
Applying: depmod.sh: fix syntax check and uage message
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 (d0c8ba40c6cc swiotlb: update comments to refer to 
physical instead of virtual addresses)
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove 
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (6dc8c9d147dd Merge branches 'fixes' and 'sa1100-for-next' 
into for-next)
Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include 
linux/vmalloc.h for vmap())
Merging arm-soc/for-next (779254581405 ARM: Document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (5d73209c1465 Merge branch 'v4.18/defconfig' into 
Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next)
Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into 
Merging bcm2835/for-next (5c483a0c319c Merge branch 
anholt/bcm2835-defconfig-64-next into for-next)
Merging imx-mxs/for-next (ba4e30d7475e Merge branch 'imx/defconfig' into 
Merging keystone/next (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into 
Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into 
Merging mvebu/for-next (e76bec8e643a Merge branch 'mvebu/dt64' into 
Merging omap/for-next (4a8358b16575 Merge branch 'omap-for-v4.18/dt' into 
Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream 
demux system reset control)
Merging qcom/for-next (33f38d6f2e8a Merge branch 'arm64-for-4.18' into 
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (a3d17bc4eb30 Merge branches 'arm64-dt-for-v4.18', 
'dt-bindings-for-v4.18' and 'dt-for-v4.18' into next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging rockchip/for-next (4c0d17bdf92a Merge branch 'v4.18-armsoc/dts64' into 
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (0d261f171e6a Merge branch 'next/dt' into 
Merging sunxi/sunxi/for-next (a0d44bf53e9a Merge branch 'sunxi/h3-h5-for-4.18' 
into sunxi/for-next)
Merging tegra/for-next (0331f709c1b5 Merge branch for-4.18/arm64/dt into 
Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to 
conditionally yield the NEON under PREEMPT)
Merging clk/clk-next (88df1dabb1b5 Merge branch 'clk-qcom-rcg-fix' into 
Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting 
Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse)
Merging m68k/for-next (f245ff73dbe9 m68k: Use read_persistent_clock64() 
Merging m68knommu/for-next (a947b3a22ca0 m68k: fix ColdFire PCI config reads 
and writes)
Merging microblaze/next (a7a9e2f0410d microblaze: dts: replace 
'linux,stdout-path' with 'stdout-path')
Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', 
'4.16-features' and 'octeon-3-net-mips-bits' into mips-next)
Merging mips-james/mips-next (8798e3921e30 MIPS: mscc: Connect phys to ports on 
CONFLICT (content): Merge conflict in arch/mips/boot/dts/xilfpga/Makefile
Merging nds32/next (fb1f3e87c22a nds32: Fix the unaligned access handler)
Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() 
instead of read_persistent_clock())
Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU 
Merging parisc-hd/for-next (07943d6329dc parisc: Build kernel without 
Merging powerpc/next (53da14d0833a powerpc: Make it clearer that systbl check 
errors are errors)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/ftrace.h
Merging powerpc-pkey/topic/pkey (d86a4ba02fc6 powerpc/pkeys: Drop private 
VM_PKEY definitions)
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to 
Merging risc-v/for-next (67b8d5c70812 Linux 4.17-rc5)
Merging s390/features (b7e7f5051bf8 s390: remove closung punctuation from 
spectre messages)
Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of 
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic)
Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into 
Merging fscrypt/master (6da6c0db5316 Linux v4.17-rc3)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard 
Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when 
under IO limits)
Applying: f2fs: fixup for cgroup/writeback change
Merging btrfs-kdave/for-next (817be7bbba5a Merge branch 
'for-next-next-v4.18-20180514' into for-next-20180514)
CONFLICT (content): Merge conflict in fs/btrfs/props.c
Merging ceph/master (fc218544fbc8 ceph: fix iov_iter issues in 
Merging cifs/for-next (ef86c0628b32 smb3: rename encryption_required to 
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names 
when using filename encryption)
Merging ext3/for_next (b1255ee6a289 Pull UDF UTF-16 handling improvements.)
Merging ext4/dev (c89128a00838 ext4: handle errors on ext4_commit_super)
Merging f2fs/dev (5b19d284f519 f2fs: avoid fsync() failure caused by EAGAIN in 
CONFLICT (content): Merge conflict in fs/f2fs/namei.c
Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation)
Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location)
Merging nfs/linux-next (036db8bd9637 Merge branch 'for-4.17-fixes' of 
Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point 
Merging nfsd/nfsd-next (61d3da268f1c nfsd: update obselete comment referencing 
the BKL)
Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates)
Merging overlayfs/overlayfs-next (16149013f839 ovl: update documentation w.r.t 
"xino" feature)
Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND)
Merging xfs/for-next (68932e193b27 xfs: factor the ag length extension code 
into libxfs)
Merging file-locks/locks-next (7a107c0f55a3 fasync: Fix deadlock between 
task-context and interrupt-context kill_fasync())
Merging vfs/for-next (044dd087f381 Merge branches 'work.dcache', 'work.misc' 
and 'hch.aio' into for-next)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (f8521c77fcd4 Merge branch 'for-4.18-vsprintf-cleanup' 
into for-4.18)
Merging pci/next (03cdfc72ee02 Merge branch 'pci/virtualization')
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/pci.h
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies 
without compression)
Merging hid/for-next (10a5884d47f4 Merge branch 'for-4.18/i2c-hid' into 
Merging i2c/i2c/for-next (b3352afa1fa6 Merge branch 'i2c/for-4.18' into 
Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string)
Merging hwmon-staging/hwmon-next (6153ff637b26 hwmon: (ltc2990) support all 
measurement modes)
Merging jc_docs/docs-next (b971a90f7dd3 docs: ranoops.rst: fix location of 
CONFLICT (modify/delete): 
Documentation/features/io/dma-api-debug/arch-support.txt deleted in HEAD and 
modified in jc_docs/docs-next. Version jc_docs/docs-next of 
Documentation/features/io/dma-api-debug/arch-support.txt left in tree.
$ git rm -f Documentation/features/io/dma-api-debug/arch-support.txt
Merging v4l-dvb/master (2a5f2705c976 media: lgdt330x.h: fix compiler warning)
Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: 
Merging fbdev/fbdev-for-next (dbeef4fe697b video: fbdev: pxafb: match_string() 
conversion fixup)
Merging pm/linux-next (76d5e09417f5 Merge branch 'pm-cpufreq-sched' into 
Merging cpupower/cpupower (9fd0c4045146 cpupower: fix spelling mistake: 
"logilename" -> "logfilename")
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (28fa4aca262c PM / OPP: Remove 
Merging thermal/next (60abce9f43d8 Merge branch 'thermal-soc' into next)
Merging thermal-soc/next (9efc58dfa14a thermal: mediatek: use 
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized 
DMA reads on JMicron controllers)
Merging dlm/next (f706d830154b dlm: make sctp_connect_to_sock() return in 
specified time)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement 
xen_swiotlb_get_sgtable callback)
Merging rdma/for-next (832369fa6410 IB/{hfi1, qib, rdmavt}: Move logic to 
allocate receive WQE into rdmavt)
Merging net-next/master (0b7d9978406f Merge branch 
CONFLICT (modify/delete): arch/s390/net/bpf_jit.S deleted in net-next/master 
and modified in HEAD. Version HEAD of arch/s390/net/bpf_jit.S left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
$ git rm -f arch/s390/net/bpf_jit.S
Merging bpf-next/master (c5c7d7f3c451 Merge branch 'bpf-sock-hashmap')
CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
Merging ipsec-next/master (724e47a149f5 net-next/hinic: add pci device ids for 
25ge and 100ge card)
Merging netfilter-next/master (289e1f4e9e4a net: ipv4: ipconfig: fix unused 
Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET 
Merging ipvs-next/master (90278871d4b0 Merge 
Merging wireless-drivers-next/master (763ece85f45a brcmfmac: fix initialization 
of struct cfg80211_inform_bss variable)
Merging bluetooth/master (7f98779fd9b3 Bluetooth: Add a new 13d3:3496 QCA_ROME 
CONFLICT (content): Merge conflict in 
Merging mac80211-next/master (57c6cb81717f mac80211: ethtool: avoid 32 bit 
multiplication overflow)
Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize)
Merging mtd/mtd/next (ea092fb3ce66 mtd: cfi_cmdset_0002: Fix coding style 
Merging nand/nand/next (39138c1f4a31 mtd: rawnand: use bit-wise majority to 
recover the ONFI param page)
Merging spi-nor/spi-nor/next (f134fbbb4ff8 mtd: spi-nor: clear Winbond Extended 
Address Reg on switch to 3-byte addressing.)
Merging crypto/master (730f23b66095 crypto: vmx - Remove overly verbose printk 
from AES XTS init)
Merging drm/drm-next (95d2c3e15da6 Merge branch 'drm-next-4.18' of 
git://people.freedesktop.org/~agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in 
Applying: drm/xen-front: merge fix for "drivers: remove force dma flag from 
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add 
support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (01f83786f9ab drm/i915: Update DRIVER_DATE to 
Merging drm-tegra/drm/tegra/for-next (abf5c3f871e6 drm/tegra: Adding new 
typedef vm_fault_t)
Merging drm-misc/for-linux-next (2045b22461c0 Merge tag 
'drm-misc-next-2018-05-15' of git://anongit.freedesktop.org/drm/drm-misc into 
Merging drm-msm/msm-next (64cb96587ba6 drm/msm: Switch to 
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of 
drm_dev_unref with drm_dev_put.)
Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB 
conversion support for video layers)
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 (22cd2b2b3151 drm/imx: Remove last traces of 
struct imx_drm_crtc)
Merging etnaviv/etnaviv/next (0b50dffa736b drm/etnaviv: remove register logging)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (76f721867da6 Merge branch 'regmap-4.18' into 
Merging sound/for-next (862154bbd7d7 ALSA: hda/ca0132: constify parameter table 
for effects)
Merging sound-asoc/for-next (da369113529f Merge remote-tracking branches 
'asoc/topic/doc' and 'asoc/topic/trace' into asoc-next)
Merging modules/modules-next (c554b8986801 module: Allow to always show the 
status of modsign)
Merging input/next (89f84b84d351 Input: usbtouchscreen - add sysfs attribute 
for 3M MTouch firmware rev)
Merging block/for-next (da3c6efea5b9 Remove jsflash driver)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in 
Merging device-mapper/for-next (28700a36232b dm thin: update Documentation to 
clarify when "read_only" is valid)
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for 
scsi drivers)
Merging mmc/next (cf56c819c851 mmc: tegra: remove redundant return statement)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping 
Merging md/for-next (643369299cfe raid5: copy write hint from origin bio to 
Merging mfd/for-mfd-next (ae0280fe1689 mfd: tps65911-comparator: Fix a build 
Merging backlight/for-backlight-next (cd4270258cbe backlight: as3711_bl: fix 
device-tree node leaks)
Merging battery/for-next (1f140ff46708 Merge tag 'tags/tcpm-pps-4.18' into 
CONFLICT (content): Merge conflict in drivers/usb/core/hcd.c
Merging regulator/for-next (1fd083554fa0 Merge branch 'regulator-4.18' into 
Merging security/next-testing (890e2abe1028 dh key: get rid of stack allocated 
array for zeroes)
Merging apparmor/apparmor-next (cb740f574c7b apparmor: modify audit rule 
support to support profile stacks)
Merging integrity/next-integrity (3dea0d93d257 ima: Unify logging)
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent 
Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record)
Merging tpmdd/next (f5495bb9aca4 tpm: replace kmalloc() + memcpy() with 
Merging watchdog/master (67b8d5c70812 Linux 4.17-rc5)
Merging iommu/next (00dcb938d482 Merge branches 'iommu/fixes', 
'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' 
into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (e506d953550a vfio: platform: Make printed error messages 
more consistent)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (c0b0ae8a871b audit: use inline function to set audit 
CONFLICT (content): Merge conflict in security/selinux/selinuxfs.c
Merging devicetree/for-next (3098e5b7eebc drm: rcar-du: disable dtc 
graph-endpoint warnings on DT overlays)
Merging mailbox/mailbox-for-next (dfbc9c5841fc mailbox: Remove depends on 
HAS_DMA in case of platform dependency)
Merging spi/for-next (f69b425742b1 Merge branch 'spi-4.18' into spi-next)
Merging tip/auto-latest (eee5fb11dbc6 Merge branch 'x86/vdso')
CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c
Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: 
Add different counter width support)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of 
Merging edac-amd/for-next (9ef20753e044 EDAC, altera: Fix ARM64 build warning)
Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when 
updating irq type)
Merging ftrace/for-next (0c5a9acc8b4e tracing: Fix the file mode of stack 
Merging rcu/rcu/next (de94f0b65dd4 torture: Keep old-school dmesg format)
CONFLICT (content): Merge conflict in drivers/nvme/host/core.c
Merging kvm/linux-next (3a2936dedd20 kvm: mmu: Don't expose private memslots to 
Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary 
ERRATA_MIDR_ALL_VERSIONS compatibility macro)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR 
for T&E)
Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use 
__gfn_to_pfn_memslot() in page fault handler)
Merging kvms390/next (911eeef91b48 KVM: s390: generalize 
Merging xen-tip/linux-next (d1ecfa9d1f40 x86/xen: Reset VCPU0 info pointer 
after shared_info remap)
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users 
from depending on internal RCU grace periods)
Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next)
Merging drivers-x86/for-next (c6d24c324e78 lib/string_helpers: Add missed 
declaration of struct task_struct)
Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to 
Merging leds/for-next (e081c49e30ec leds: Add Spreadtrum SC27xx breathing light 
controller driver)
Merging ipmi/for-next (163475ebf9f3 ipmi: Remove the proc interface)
Merging driver-core/driver-core-next (6a8b55d7f226 driver core: add __printf 
verification to device_create_groups_vargs)
Merging usb/usb-next (58318cd4df41 Merge 4.17-rc4 into usb-next)
CONFLICT (content): Merge conflict in drivers/usb/usbip/stub_main.c
CONFLICT (content): Merge conflict in drivers/usb/usbip/stub_dev.c
Merging usb-gadget/next (60cc43fc8884 Linux 4.17-rc1)
Merging usb-serial/usb-next (4d304a6fe935 USB: serial: option: blacklist unused 
dwm-158 interfaces)
Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly 
handle host or gadget initialization failure)
Merging phy-next/next (cd3bf368aa7a phy: Add a driver for the ATH79 USB phy)
Merging tty/tty-next (b6da31b2c07c tty: Fix data race in 
Merging char-misc/char-misc-next (897609370d25 Drivers: hv: vmbus: Removed an 
unnecessary cast from void *)
Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1)
Merging staging/staging-next (45ad559a2962 staging: android: ion: Switch to 
pr_warn_once in ion_buffer_destroy)
Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API)
Merging slave-dma/next (95c1e4acb0c4 Merge branch 'topic/sprd' into next)
Merging cgroup/for-next (cc659e76f375 rdmacg: Convert to use match_string() 
Merging scsi/for-next (5aab3787c800 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (66b7eaca548d scsi: mptlan: Fix mpt_lan_sdu_send()'s 
return type)
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 (daa81a1963b9 Merge branch 'for-4.17-fixes' into 
Merging vhost/linux-next (cfcde40e8ce3 ACPI: disable extra P_LVLx access on KVM)
Merging rpmsg/for-next (ff5cf749a5e5 Merge branches 'hwspinlock-next', 
'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (22bd82b645bc Merge branch 'devel' into for-next)
Merging pinctrl/for-next (25fc7c85ea6f Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (0ca0557e3727 pinctrl: samsung: Remove support 
for Exynos5440)
Merging pwm/for-next (692099cdcf27 pwm: simplify getting .drvdata)
Merging userns/for-next (530621b79f9e signal/um: More carefully relay signals 
in relay_signal.)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 
Merging random/dev (9e66317d3c92 Linux 4.14-rc3)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and 
counting against aio-max-nr)
Merging kselftest/next (505a139d7e43 selftests/intel_pstate: Enhance table 
CONFLICT (content): Merge conflict in 
Merging y2038/y2038 (5dc0b1529d21 y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to 
Merging livepatching/for-next (3beed9bf1e3d Merge branch 
'for-4.17/upstream-fixes' into for-next)
Merging coresight/next (659d7e66340e coresight: Remove %px for printing pcsr 
Merging rtc/rtc-next (5aa6a62d115b dt-bindings: rtc-2123: Make the node name 
Merging nvdimm/libnvdimm-for-next (638a8e3f28dc memremap: mark 
devm_memremap_pages() EXPORT_SYMBOL_GPL)
CONFLICT (content): Merge conflict in mm/hmm.c
Merging at24/at24/for-next (22e06c32b936 eeprom: at24: provide a separate 
routine for creating dummy i2c clients)
Merging ntb/ntb-next (9b42913698a1 ntb: intel: change references of skx to gen3)
Merging kspp/for-next/kspp (bd80928a6e0a Merge branch 
'kspp/gcc-plugin/stackleak-v11' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Applying: drm/amdgpu: include pagemap.h for release_pages()
Merging akpm-current/current (a64af9e7000a ipc/shm: fix shmat() nil address 
after round-down when remapping)
CONFLICT (content): Merge conflict in kernel/sched/core.c
CONFLICT (content): Merge conflict in arch/sh/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: use octal not symbolic permissions
Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX
Applying: mm: fix oom_kill event handling
Applying: kernel/kexec_file.c: add walk_system_ram_res_rev()
Applying: kernel/kexec_file.c: load kernel at top of system RAM if required
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Applying: sparc64: NG4 memset 32 bits overflow
Merging akpm/master (ee45f3e2249c sparc64: NG4 memset 32 bits overflow)

Attachment: pgpkbIJ3VX6QI.pgp
Description: OpenPGP digital signature

Reply via email to