Hi all,

Please do not add any v4.18 destined stuff to your linux-next included
trees until after v4.17-rc1 has been released.

Changes since 20180406:

The vfs tree lost its build failure.

The parisc-hd tree still had its build failure for which I applied a patch.

The nvdimm tree gained a build failure so I used the version from
next-20180406.

Non-merge commits (relative to Linus' tree): 1826
 1817 files changed, 67325 insertions(+), 33557 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 258 trees (counting Linus' and 44 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 (f8cf2f16a7c9 Merge branch 'next-integrity' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
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 (28913ee8191a netfilter: nf_nat_snmp_basic: add 
correct dependency to Makefile)
Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4)
Merging arm-current/fixes (1b8837b61714 ARM: 8750/1: deflate_xip_data.sh: minor 
fixes)
Merging arm64-fixes/for-next/fixes (e21da1c99200 arm64: Relax 
ARM_SMCCC_ARCH_WORKAROUND_1 discovery)
Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" 
comment)
Merging powerpc-fixes/fixes (52396500f97c powerpc/64s: Fix i-side SLB miss bad 
address handler saving nonvolatile GPRs)
Merging sparc/master (17dec0a94915 Merge branch 'userns-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (4c7c12e0c9b8 Merge branch 'for-upstream' of 
git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging bpf/master (33491588c1fb kernel/bpf/syscall: fix warning defined but 
not used)
Merging ipsec/master (9a3fb9fb84cc xfrm: Fix transport mode skb control buffer 
usage.)
Merging netfilter/master (b9fc828debc8 qede: Fix barrier usage after tx 
doorbell write.)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook 
mask only if set)
Merging wireless-drivers/master (4608f064532c Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next)
Merging mac80211/master (b5dbc28762fd Merge tag 'kbuild-fixes-v4.16-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging rdma-fixes/for-rc (84652aefb347 RDMA/ucma: Introduce safer 
rdma_addr_size() variants)
Merging sound-current/for-linus (e15dc99dbb9c ALSA: pcm: Fix endless loop for 
XRUN recovery in OSS emulation)
Merging pci-current/for-linus (fc110ebdd014 PCI: dwc: Fix enumeration end when 
reaching root subordinate)
Merging driver-core.current/driver-core-linus (38c23685b273 Merge tag 
'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging tty.current/tty-linus (38c23685b273 Merge tag 'armsoc-drivers' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging usb.current/usb-linus (38c23685b273 Merge tag 'armsoc-drivers' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging usb-gadget-fixes/fixes (c6ba5084ce0d usb: gadget: udc: renesas_usb3: 
add binging for r8a77965)
Merging usb-serial-fixes/usb-linus (86d71233b615 USB: serial: ftdi_sio: add 
support for Harman FirmwareHubEmulator)
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: 
fix ulpi-node lookup)
Merging phy/fixes (59fba0869aca phy: qcom-ufs: add MODULE_LICENSE tag)
Merging staging.current/staging-linus (df34df483a97 Merge tag 
'staging-4.17-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
Merging char-misc.current/char-misc-linus (38c23685b273 Merge tag 
'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging input-current/for-linus (664b0bae0b87 Merge branch 'next' into 
for-linus)
Merging crypto-current/master (f444ec106407 crypto: ccree - remove unused enums)
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 (ba004a2955f7 selftests: memory-hotplug: fix 
emit_tests regression)
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: 
fix device-tree node leaks)
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 (107b7d9fa94c mfd: rtsx: Release IRQ during 
shutdown)
Merging v4l-dvb-fixes/fixes (a95845ba184b media: v4l2-core: fix size of 
devnode_nums[] bitarray)
Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit 
compilation)
Merging mips-fixes/mips-fixes (a63d706ea719 MIPS: ralink: Fix booting on MT7621)
Merging kvm-fixes/master (17a1079d9c63 KVM: x86: Fix pv tlb flush dependencies)
Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites 
when not using SCA entries)
Merging drm-intel-fixes/for-linux-next-fixes (3eb2ce825ea1 Linux 4.16-rc7)
Merging drm-misc-fixes/for-linux-next-fixes (5a9f698feb11 drm/ast: Fixed 
1280x800 Display Issue)
Merging syscalls/syscalls-next (c9a211951c7c bpf: whitelist all syscalls for 
error injection)
Merging kbuild/for-next (b41d920acff8 kbuild: deb-pkg: split generating 
packaging and build)
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 (1f674e16f9ce usb: gadget: Add NO_DMA dummies for 
DMA mapping API)
Merging asm-generic/master (8d14f31ec9ac dts: remove cris & metag dts hard link 
file)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (8ebc94dabaca Merge branch 'fixes' into for-next)
Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include 
linux/vmalloc.h for vmap())
Merging arm-soc/for-next (38c23685b273 Merge tag 'armsoc-drivers' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
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 (059e40d90876 Merge branch 'v4.17/drivers' into 
tmp/aml-rebuild)
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 
at91-next)
Merging bcm2835/for-next (cf172af3be59 Merge branch 
anholt/bcm2835-defconfig-next into for-next)
Merging imx-mxs/for-next (98f9530adda3 Merge branch 'imx/defconfig' into 
for-next)
Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into 
next)
Merging mvebu/for-next (4c1b45a44e35 Merge branch 'mvebu/dt64' into 
mvebu/for-next)
Merging omap/for-next (d1cc5c055f7a Merge branch 'omap-for-v4.17/defconfig' 
into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi
Merging reset/reset/next (0089313d8595 Merge branch 'reset/lookup' into 
reset/next)
Merging qcom/for-next (186d88395e05 Merge tag 'qcom-arm64-defconfig-for-4.17' 
into all-for-4.17-final)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (58eb42a95b24 Merge branches 'arm64-defconfig-for-v4.17', 
'arm64-dt-for-v4.17', 'defconfig-for-v4.17', 'dt-bindings-for-v4.17', 
'dt-for-v4.17' and 'soc-for-v4.17' into next)
Merging rockchip/for-next (f5a45eb97728 Merge branch 'v4.17-armsoc/dts64' into 
for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (0bc590a59ce6 Merge branch 'next/soc' into 
for-next)
Merging sunxi/sunxi/for-next (2d567752a056 Merge branch 'sunxi/clk-for-4.17' 
into sunxi/for-next)
Merging tegra/for-next (6b9b5116227d Merge branch for-4.17/clk into for-next)
Merging arm64/for-next/core (65896545b69f arm64: uaccess: Fix omissions from 
usercopy whitelist)
Merging clk/clk-next (246d61b7f685 Merge branch 'clk-davinci' into clk-next)
Merging clk-samsung/for-next (182c084da5d1 clk: samsung: Add fout=196608001 Hz 
EPLL rate entry for exynos4412)
Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c 
get_coreid build error)
Merging m68k/for-next (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment)
Merging m68knommu/for-next (f61e64310b75 m68k: set dma and coherent masks for 
platform FEC ethernets)
Merging microblaze/next (70f6283a372b microblaze: Use generic 
pci_mmap_resource_range())
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 (a5075e6226c4 MIPS: BCM47XX: Use standard reset 
button for Luxul XWR-1750)
Merging nds32/next (6fc61ee69433 nds32: To use the generic dump_stack())
Merging nios2/for-next (e0691ebb33c1 nios2: defconfig: Cleanup from old Kconfig 
options)
Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU 
define)
Merging parisc-hd/for-next (186536608fd1 parisc/signal: Add FPE_CONDTRAP for 
conditional trap handling)
Applying: parisc/signal: Add FPE_CONDTRAP for conditional trap handling fix
Merging powerpc/next (c1b25a17d249 powerpc/64s/idle: Fix restore of AMOR on 
POWER9 after deep sleep)
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to 
platform_device)
Merging risc-v/for-next (0adb32858b0b Linux 4.16)
Merging s390/features (92fa7a13c845 s390/kvm: improve stack frame constants in 
entry.S)
CONFLICT (content): Merge conflict in drivers/video/console/Kconfig
Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging sh/for-next (d67cbbb113b7 arch/sh: pcie-sh7786: handle non-zero DMA 
offset)
Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic)
Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into 
xtensa-for-next)
Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc 
versions)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard 
issues)
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 (ed754f23c363 Merge branch 
'for-next-next-v4.17-20180405' into for-next-20180405)
Merging ceph/master (50b37a1c3d59 rbd: avoid Wreturn-type warnings)
Merging cifs/for-next (d2b1e074a47c SMB3: Fix length checking of SMB3.11 
negotiate request)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
Merging ecryptfs/next (f62fd7a77717 ecryptfs: fix spelling mistake: "cadidate" 
-> "candidate")
Merging ext3/for_next (b91ed9d8082c quota: Kill an unused extern entry form 
quota.h)
Merging ext4/dev (b025a674fc5d ext4: force revalidation of directory pointer 
after seekdir(2))
Merging f2fs/dev (214c2461a864 f2fs: remain written times to update inode 
during fsync)
Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation)
Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location)
Merging nfs/linux-next (0adb32858b0b Linux 4.16)
Merging nfs-anna/linux-next (0dea79bc353f NFS: advance nfs_entry cookie only 
after decoding completes successfully)
Merging nfsd/nfsd-next (880a3a532548 nfsd: fix incorrect umasks)
Merging orangefs/for-next (8e9ba5c48ea6 Orangefs: documentation updates)
Merging overlayfs/overlayfs-next (3e277162a768 ovl: update documentation w.r.t 
"xino" feature)
Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND)
Merging xfs/for-next (dc1baa715bbf xfs: do not log/recover swapext extent owner 
changes for deleted inodes)
Merging file-locks/locks-next (86f84779d8e9 Merge branch 'siginfo-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging vfs/for-next (fd70f4425f9b Merge branches 'work.dcache', 'old.dcache', 
'work.misc', 'work.thaw', 'misc.compat' and 'misc.sparc' into for-next)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (23545acc2a0e Merge branch 'for-4.17' into for-next)
Merging pci/next (5f7644190986 Merge remote-tracking branch 
'lorenzo/pci/cadence' into next)
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies 
without compression)
Merging hid/for-next (e221c81efb0c Merge branch 'for-4.17/google-hammer' into 
for-next)
CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c
Merging i2c/i2c/for-next (af43a5785853 Merge branch 'i2c/for-4.17' into 
i2c/for-next)
Merging dmi/master (eb693e35e850 firmware: dmi_scan: add DMI_OEM_STRING support 
to dmi_matches)
Merging hwmon-staging/hwmon-next (e3a2d2be510e hwmon: (via-cputemp) support new 
centaur CPUs)
Merging jc_docs/docs-next (86afad7d87f5 Documentation/process: update FUSE 
project website)
Merging v4l-dvb/master (17dec0a94915 Merge branch 'userns-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging v4l-dvb-next/master (17dec0a94915 Merge branch 'userns-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging fbdev/fbdev-for-next (7c9b845e79ea video: fbdev: s3c-fb: remove dead 
platform code for Exynos and S5PV210 platforms)
CONFLICT (content): Merge conflict in drivers/video/console/Kconfig
Merging pm/linux-next (f798bef0859a time: hrtimer: Use 
timerqueue_iterate_next() to get to the next timer)
Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (4a823c0be80f opp: cpu: Replace GFP_ATOMIC with 
GFP_KERNEL in dev_pm_opp_init_cpufreq_table)
Merging thermal/next (f8837aac36cd Merge branches 'thermal-core' and 
'thermal-soc' into next)
Merging thermal-soc/next (2db48884bb51 dt-bindings: thermal: Remove 
"cooling-{min|max}-level" properties)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized 
DMA reads on JMicron controllers)
Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement 
xen_swiotlb_get_sgtable callback)
Merging rdma/for-next (efc365e7290d IB/rxe: Fix for oops in rxe_register_device 
on ppc64le arch)
Merging net-next/master (17dec0a94915 Merge branch 'userns-linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging bpf-next/master (4608f064532c Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next)
Merging ipsec-next/master (415a13296a1a xfrm_policy: use true and false for 
boolean values)
Merging netfilter-next/master (159f02977b2f Merge branch 
'net-mvneta-improve-suspend-resume')
Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET 
support)
Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' 
error.)
Merging wireless-drivers-next/master (14c99949a339 Merge ath-next from 
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (dd5caa5c058d Bluetooth: btqcomsmd: Fix rx/tx stats)
Merging mac80211-next/master (159f02977b2f Merge branch 
'net-mvneta-improve-suspend-resume')
Merging gfs2/for-next (06dd3dfeea60 Merge tag 'char-misc-4.17-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
Merging mtd/master (87a73eb5b56f mtd: jedec_probe: Fix crash in 
jedec_read_mfr())
Merging l2-mtd/mtd/next (fe5f31a8010a Merge tag 'v4.16-rc2' of 
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mtd/next)
Merging nand/nand/next (097ccca726ff mtd: nand: Fix some function description 
mismatches in core.c)
Merging spi-nor/spi-nor/next (e8de85d5a107 dt-bindings: fsl-quadspi: Add the 
example of two SPI NOR)
Merging crypto/master (f444ec106407 crypto: ccree - remove unused enums)
Merging drm/drm-next (694f54f680f7 Merge branch 'drm-misc-next-fixes' of 
git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add 
support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (38057aa1639b drm/i915/execlists: Clear 
user-active flag on preemption completion)
Merging drm-tegra/drm/tegra/for-next (27e92f1f1600 drm/tegra: prime: Implement 
->{begin,end}_cpu_access())
Merging drm-misc/for-linux-next (41613a1a7df2 drm/omap: fix crash if there's no 
video PLL)
Merging drm-msm/msm-next (288e5c8898c4 drm/msm: fix building without debugfs)
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 (28e228073b07 drm/imx: Remove last traces of 
struct imx_drm_crtc)
Merging etnaviv/etnaviv/next (4ed75c3e5255 drm/etnaviv: bump HW job limit to 4)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (2889312616ae Merge remote-tracking branches 
'regmap/topic/debugfs' and 'regmap/topic/mmio-clk' into regmap-next)
Merging sound/for-next (e15dc99dbb9c ALSA: pcm: Fix endless loop for XRUN 
recovery in OSS emulation)
Merging sound-asoc/for-next (445bb423f6a3 Merge remote-tracking branch 
'asoc/topic/zx_aud96p22' into asoc-next)
Merging modules/modules-next (3f553b308bb0 module: propagate error in 
modules_open())
Merging input/next (04bb1719c4de Input: i8042 - enable MUX on Sony VAIO VGN-CS 
series to fix touchpad)
Merging block/for-next (667eea5d591b Merge branch 'for-4.17/block' into 
for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in 
pblk-init.c)
Merging device-mapper/for-next (5bd5e8d891c1 dm: remove fmode_t argument from 
.prepare_ioctl hook)
Merging mmc/next (fc167daff581 mmc: tmio: Fix error handling when issuing CMD23)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping 
memcpy)
Merging md/for-next (3de59bb9d551 md/raid1: fix NULL pointer dereference)
Merging mfd/for-mfd-next (b45bf45f1b82 mfd: arizona: Update reset pin to use 
GPIOD)
Merging backlight/for-backlight-next (ea388d6cffd4 pwm-backlight: Add support 
for PWM delays proprieties.)
Merging battery/for-next (fd73a3e61888 power: reset: at91-reset: Switch from 
the pr_*() to the dev_*() logging functions)
Merging regulator/for-next (36fd679f45a2 Merge remote-tracking branches 
'regulator/topic/88pg86x', 'regulator/topic/dt', 'regulator/topic/formatting' 
and 'regulator/topic/gpio' into regulator-next)
Merging security/next-testing (3f3122c1b84c Fixup after manual conflict merge, 
for testing only.)
CONFLICT (content): Merge conflict in include/linux/lsm_hooks.h
CONFLICT (modify/delete): drivers/scsi/eata.c deleted in HEAD and modified in 
security/next-testing. Version security/next-testing of drivers/scsi/eata.c 
left in tree.
$ git rm -f drivers/scsi/eata.c
Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on 
buffer on error exit path)
Merging efi-lock-down/efi-lock-down (89bcd5b02f12 lockdown: Print current->comm 
in restriction messages)
Merging integrity/next-integrity (ab60368ab6a4 ima: Fallback to the builtin 
hash algorithm)
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent 
tainting)
Merging selinux/next (6b6bc6205d98 selinux: wrap AVC state)
Merging tpmdd/next (2be8ffed093b tpm: fix intermittent failure with self tests)
Merging watchdog/master (1991a55dc87e Merge branch 'v4.17-rc1')
Merging iommu/next (d4f96fd5c249 Merge branches 'x86/amd', 'x86/vt-d', 
'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas', 
'arm/smmu' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (da9147140fe3 MAINTAINERS: vfio/platform: Update 
sub-maintainer)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (ea841bafda3f audit: add refused symlink to audit_names)
Merging devicetree/for-next (827473268ee4 of: unittest: fix an error code in 
of_unittest_apply_overlay())
Merging mailbox/mailbox-for-next (41c0e939d70d mailbox: Add support for Hi3660 
mailbox)
Merging spi/for-next (0930437e8f9d Merge remote-tracking branches 
'spi/topic/sh-msiof', 'spi/topic/sprd' and 'spi/topic/tegra20-slink' into 
spi-next)
Merging tip/auto-latest (f78e5d05f9f1 Merge branch 'efi/urgent')
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
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 
git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (6fd052665274 EDAC, sb_edac: Remove variable length 
array usage)
Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when 
updating irq type)
Merging ftrace/for-next (b0dc52f15e7f init: Have initcall_debug still work 
without CONFIG_TRACEPOINTS)
CONFLICT (modify/delete): Documentation/trace/ftrace.txt deleted in HEAD and 
modified in ftrace/for-next. Version ftrace/for-next of 
Documentation/trace/ftrace.txt left in tree.
CONFLICT (content): Merge conflict in Documentation/trace/events.rst
$ git rm -f Documentation/trace/ftrace.txt
Applying: trace doc: merge fix for rst conversion of ftrace.txt
Merging rcu/rcu/next (338c46403f16 Merge branches 'fixes.2018.02.23a', 
'srcu.2018.02.20a' and 'torture.2018.02.20a' into HEAD)
Merging kvm/linux-next (27aa8962817a Merge tag 'kvm-ppc-next-4.17-1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc)
CONFLICT (content): Merge conflict in drivers/video/console/Kconfig
CONFLICT (content): Merge conflict in drivers/video/Kconfig
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
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 (ccc40c53c07b KVM: s390: provide counters for all 
interrupt injects/delivery)
Merging xen-tip/linux-next (c37a3c947758 xen/acpi: off by one in read_acpi_id())
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 (0e5b09b16551 platform/x86: dell-smbios: Fix 
memory leaks in build_tokens_sysfs())
Merging chrome-platform/for-next (3b7cedb42420 platform/chrome: cros_ec_lpc: 
Add support for Google devices using custom coreboot firmware)
Merging hsi/for-next (e3d7fbab062b HSI: hsi_char: Delete an error message for a 
failed memory allocation in hsc_probe())
Merging leds/for-next (92d7ec1d71e3 leds: Fix wrong dmi_match on PC Engines APU 
LEDs)
Merging ipmi/for-next (c6185e285c5c ipmi/parisc: Add IPMI chassis poweroff for 
certain HP PA-RISC and IA-64 servers)
Merging driver-core/driver-core-next (38c23685b273 Merge tag 'armsoc-drivers' 
of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging usb/usb-next (38c23685b273 Merge tag 'armsoc-drivers' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging usb-gadget/next (aaeab02ddcc8 usb/gadget: Add an EP dispose() callback 
for EP lifetime tracking)
Merging usb-serial/usb-next (79a0b33165d8 USB: serial: ftdi_sio: add Id for 
Physik Instrumente E-870)
Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix 
ULPI on imx53)
Merging phy-next/next (e7f4da4c44fe phy: tegra: xusb: Uncomment register write)
Merging tty/tty-next (38c23685b273 Merge tag 'armsoc-drivers' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging char-misc/char-misc-next (38c23685b273 Merge tag 'armsoc-drivers' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging extcon/extcon-next (eb7768e774d1 Merge branch 'ib-extcon-drm-dt-v4.17' 
into extcon-next)
Merging staging/staging-next (df34df483a97 Merge tag 'staging-4.17-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API)
Merging slave-dma/next (df0517c76e89 Merge branch 'topic/stm' into next)
Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded 
mode switching)
Merging scsi/for-next (2e1f44f6ad80 Merge branch 'fixes' into misc)
Applying: scsi: qla2xxx: merge fix in qla_gs.c
Merging scsi-mkp/for-next (e5ad16982403 scsi: fnic: fix spelling mistake: 
"abord" -> "abort")
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake 
up sleeping login worker)
Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging libata/for-next (d64c228ea181 Merge branch 'for-4.17' into for-next)
Merging vhost/linux-next (dc32bb678e10 vhost: add vsock compat ioctl)
Merging rpmsg/for-next (191d228609da Merge branches 'hwspinlock-next', 
'rpmsg-next' and 'rproc-next' into for-next)
CONFLICT (content): Merge conflict in samples/Makefile
Merging gpio/for-next (348f3cde84ab gpio: Add Spreadtrum PMIC EIC driver 
support)
Merging pinctrl/for-next (4fc97ef94bbf pinctrl: uniphier: add UART hardware 
flow control pin-mux settings)
Merging pinctrl-samsung/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging pwm/for-next (6873842235d6 pwm: rcar: Add suspend/resume support)
Merging userns/for-next (4be33329d46f m68k: Verify the offsets in struct 
siginfo never change.)
Merging ktest/for-next (c2d84ddb338c ktest.pl: Add MAIL_COMMAND option to 
define how to send email)
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 (6aa69043d9f3 selftests/intel_pstate: Fix build rule for 
x86)
Merging y2038/y2038 (ce380619fab9 Merge tag 'please-pull-ia64_misc' of 
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
Merging livepatching/for-next (d13f5d84ca27 Merge branch 
'for-4.16/signal-sysfs-force-v2' into for-next)
Merging coresight/next (7e7408725e0d coresight: use put_device() instead of 
kfree())
Merging rtc/rtc-next (1485991c0246 rtc: snvs: Fix usage of snvs_rtc_enable)
Merging nvdimm/libnvdimm-for-next (7e08841f8883 Merge branch 'for-4.17/dax' 
into libnvdimm-for-next)
$ git reset --hard HEAD^
Merging next-20180406 version of nvdimm
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in 
LDFLAGS too)
Merging at24/at24/for-next (84e10623c0b9 dt-bindings: at24: add Renesas 
R1EX24128)
Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3)
Merging kspp/for-next/kspp (0adb32858b0b Linux 4.16)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging akpm-current/current (56c7680f4bf2 ipc/shm.c: shm_split(): remove 
unneeded test for NULL shm_file_data.vm_ops)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: include/linux/kfifo.h: fix comment
Applying: fs/dcache.c: add cond_resched() in shrink_dentry_list()
Applying: MAINTAINERS: update bouncing aacr...@adaptec.com addresses
Applying: kexec_file: make use of purgatory optional
Applying: kexec_file-make-an-use-of-purgatory-optional-fix
Applying: kexec_file,x86,powerpc: factor out kexec_file_ops functions
Applying: x86: kexec_file: purge system-ram walking from prepare_elf64_headers()
Applying: x86: kexec_file: remove X86_64 dependency from prepare_elf64_headers()
Applying: x86: kexec_file: lift CRASH_MAX_RANGES limit on crash_mem buffer
Applying: x86: kexec_file: clean up prepare_elf64_headers()
Applying: kexec_file, x86: move re-factored code to generic side
Applying: include/linux/kexec.h: silence compile warnings
Applying: kernel/kexec_file.c: remove checks in kexec_purgatory_load
Applying: kernel/kexec_file.c: make purgatory_info->ehdr const
Applying: kernel/kexec_file.c: search symbols in read-only kexec_purgatory
Applying: kernel/kexec_file.c: use read-only sections in 
arch_kexec_apply_relocations*
Applying: kernel/kexec_file.c: split up __kexec_load_puragory
Applying: kernel/kexec_file.c: remove unneeded for-loop in 
kexec_purgatory_setup_sechdrs
Applying: kernel/kexec_file.c: remove unneeded variables in 
kexec_purgatory_setup_sechdrs
Applying: kernel/kexec_file.c: remove mis-use of sh_offset field during 
purgatory load
Applying: kernel/kexec_file.c: allow archs to set purgatory load address
Applying: kernel/kexec_file.c: move purgatories sha256 to common code
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: mm: introduce MAP_FIXED_NOREPLACE
Applying: fs, elf: drop MAP_FIXED usage from elf_map
Applying: elf: enforce MAP_FIXED on overlaying elf segments
Applying: xen, mm: allow deferred page initialization for xen pv domains
Applying: linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI
Applying: linux/const.h: move UL() macro to include/linux/const.h
Applying: linux/const.h: refactor _BITUL and _BITULL a bit
Applying: mm: memcg: remote memcg charging for kmem allocations
Applying: mm: memcg: remote memcg charging for kmem allocations fix
Applying: fs: fsnotify: account fsnotify metadata to kmemcg
Applying: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix
Applying: radix tree: use GFP_ZONEMASK bits of gfp_t for flags
Applying: mac80211_hwsim: use DEFINE_IDA
Applying: arm64: turn flush_dcache_mmap_lock into a no-op
Applying: unicore32: turn flush_dcache_mmap_lock into a no-op
Applying: export __set_page_dirty
Applying: fscache: use appropriate radix tree accessors
Applying: xarray: add the xa_lock to the radix_tree_root
Applying: page cache: use xa_lock
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Applying: sparc64: NG4 memset 32 bits overflow
Merging akpm/master (b08b6766a4a1 sparc64: NG4 memset 32 bits overflow)

Attachment: pgpKhK5gACUfb.pgp
Description: OpenPGP digital signature

Reply via email to