linux-next: Tree for May 2

linux-next: Tree for May 2

[Stephen Rothwell]

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

Hi all,

Please do not add any v3.11 destined work to your linux-next included
branches until after v3.10-rc1 is released.

Changes since 20130501:

The vfs tree gained conflicts against Linus' tree.

The akpm tree gained a conflict against Linus' tree and lost a lot of
patches that turned up elsewhere.

----------------------------------------------------------------------------

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" as mentioned in the FAQ on the wiki
(see below).

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 and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 224 trees (counting Linus' and 31 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (b9394d8 Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (96d8683 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client)
Merging kbuild-current/rc-fixes (a54292f kbuild: generate generic headers before recursing into scripts)
Merging arc-current/for-curr (561daec ARC: [mm] Lazy D-cache flush (non aliasing VIPT))
Merging arm-current/fixes (1783d45 ARM: 7700/2: Make cpu_init() notrace)
Merging m68k-current/for-linus (e00c73e m68k: Remove inline strlen() implementation)
Merging powerpc-merge/merge (5676005 powerpc/pseries/lparcfg: Fix possible overflow are more than 1026)
Merging sparc/master (0fbd067 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging net/master (79f632c unix/stream: fix peeking with an offset larger than data in queue)
Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging sound-current/for-linus (c5a4698 Merge tag 'asoc-maintainers-v3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (d46fc8b x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0)
Merging wireless/master (a8a48e6 Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next)
Merging driver-core.current/driver-core-linus (c1be5a5 Linux 3.9)
Merging tty.current/tty-linus (c1be5a5 Linux 3.9)
Merging usb.current/usb-linus (c1be5a5 Linux 3.9)
Merging staging.current/staging-linus (c1be5a5 Linux 3.9)
Merging char-misc.current/char-misc-linus (c1be5a5 Linux 3.9)
Merging input-current/for-linus (bf61c88 Merge branch 'next' into for-linus)
Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (3862de1 crypto: caam - fix job ring cleanup code)
Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe())
Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6)
Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS)
Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error)
Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect)
Merging rr-fixes/fixes (c1be5a5 Linux 3.9)
Merging mfd-fixes/master (31880c3 Linux 3.9-rc6)
Merging vfio-fixes/for-linus (904c680 vfio-pci: Fix possible integer overflow)
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (07961ac Linux 3.9-rc5)
Merging arm/for-next (4b6cce6 Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplug' into for-next)
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
Merging arm-perf/for-next/perf (ab87304 Merge branches 'perf/fixes' and 'hw-breakpoint' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu)
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
Merging arm64/upstream (16c85a1 arm64: Use acquire/release semantics instead of explicit DMB)
Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment)
Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore)
Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file)
Merging hexagon/linux-next (426d29c Hexagon: add v4 CS regs to core copyout macro)
Merging ia64/next (797f6a6 Add size restriction to the kdump documentation)
Merging m68k/for-next (e00c73e m68k: Remove inline strlen() implementation)
Merging m68knommu/for-next (2842e5b0 m68knommu: enable Timer on coldfire 532x)
Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB => 128KiB)
Merging microblaze/next (01cc2cb microblaze: intc: set the default irq_domain)
Merging mips/mips-for-linux-next (8303692 Merge branch 'next/kvm' into mips-for-linux-next)
Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS)
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging powerpc/next (1f6aaac powerpc: Update tlbie/tlbiel as per ISA doc)
CONFLICT (content): Merge conflict in arch/powerpc/mm/numa.c
CONFLICT (content): Merge conflict in arch/metag/mm/Kconfig
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (fdeaf0e powerpc/512x: add ifm ac14xx board)
Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (1c21351 s390/pci: use pci_scan_root_bus)
Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
Merging sparc-next/master (07df841 sparc64: Do not save/restore interrupts in get_new_mmu_context())
Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (4e34bf6 xtensa: provide default platform_pcibios_init implementation)
Merging btrfs/next (6aec51f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-linus-3.9)
Merging ceph/testing (17e4749 rbd: kill off the snapshot list)
CONFLICT (content): Merge conflict in net/ceph/osdmap.c
CONFLICT (content): Merge conflict in fs/ceph/addr.c
CONFLICT (content): Merge conflict in drivers/block/rbd.c
Merging cifs/for-next (bf81710 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (f6161aa Linux 3.9-rc2)
Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset)
Merging ext4/dev (0d606e2 ext4: fix type-widening bug in inode table readahead code)
Merging f2fs/dev (42e49df f2fs: avoid deadlock during evict after f2fs_gc)
Merging fuse/for-next (60b9df7 fuse: add flag to turn on async direct IO)
Merging gfs2/master (222cb53 GFS2: Flush work queue before clearing glock hash tables)
Merging jfs/jfs-next (73aaa22 jfs: fix a couple races)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (9c9a7f0 SUNRPC: Don't spam syslog with "Pseudoflavor not found" messages)
Merging nfsd/nfsd-next (c8c797f nfsd: make symbol nfsd_reply_cache_shrinker static)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (adf96e6 sysrq: don't depend on weak undefined arrays to have an address that compares as NULL)
Merging ubifs/linux-next (c1be5a5 Linux 3.9)
Merging xfs/for-next (123887e xfs: Teach dquot recovery about CONFIG_XFS_QUOTA)
CONFLICT (content): Merge conflict in fs/xfs/xfs_iomap.c
Merging vfs/for-next (3c3a685 minimal !CONFIG_PROC_FS fixes)
CONFLICT (content): Merge conflict in ipc/util.c
CONFLICT (content): Merge conflict in ipc/msgutil.c
CONFLICT (content): Merge conflict in fs/read_write.h
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/proc/internal.h
CONFLICT (content): Merge conflict in fs/coredump.c
CONFLICT (content): Merge conflict in fs/compat.c
CONFLICT (content): Merge conflict in drivers/staging/vt6655/device_main.c
CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_specproc.c
CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_ports_ops.c
CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_net_ops.c
CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_mon_ops.c
CONFLICT (content): Merge conflict in drivers/staging/dgrp/dgrp_dpa_ops.c
CONFLICT (modify/delete): drivers/staging/ccg/rndis.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/ccg/rndis.c left in tree.
CONFLICT (modify/delete): drivers/staging/ccg/f_fs.c deleteRecorded preimage for 'fs/compat.c'
CONFLICT (modify/delete): drivers/firmware/efivars.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/firmware/efivars.c left in tree.
CONFLICT (content): Merge conflict in arch/powerpc/kernel/rtas_flash.c
$ git rm -f drivers/firmware/efivars.c drivers/staging/ccg/f_fs.c drivers/staging/ccg/rndis.c
Applying: fs: fix up for changes to proc_fs include files
Applying: SUNRPC: update for PDE removal
Applying: efivars: Include missing linux/magic.h inclusions
Applying: efivars: use of kmalloc etc requires the inclusion of slab.h
Merging pci/next (d4f09c5 Merge branch 'pci/gavin-msi-cleanup' into next)
Merging hid/for-next (46b1897 Merge branch 'for-3.10/hid-debug' into for-next)
Merging i2c/i2c/for-next (c39e8e4 i2c: xiic: must always write 16-bit words to TX_FIFO)
CONFLICT (content): Merge conflict in drivers/staging/media/go7007/go7007-driver.c
CONFLICT (content): Merge conflict in drivers/media/pci/bt8xx/bttv-input.c
Applying: i2c: fixup for code movement from bttv_input.c
Merging jdelvare-hwmon/master (c662b7a hwmon: (lm75) Add support for the Dallas/Maxim DS7505)
Merging hwmon-staging/hwmon-next (6445e66 hwmon: (nct6775) Fix coding style problems)
Merging v4l-dvb/master (1d62caa Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (1567364 Merge branch 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/NEXT (2cc1144 sata_highbank: Rename proc_name to the module name)
Merging infiniband/for-next (f1258ea Merge branches 'misc' and 'mlx4' into for-next)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/qp.c
Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block)
Merging pm/linux-next (371deb9 Merge branch 'pm-cpufreq')
Merging idle/next (5c99726b Merge branch 'fspin' into next)
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next)
CONFLICT (content): Merge conflict in drivers/base/power/qos.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (de6558d Merge branch 'MAINTAINERS-update' of .git into next)
Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY regs read/write failures)
Merging ubi/linux-next (f6161aa Linux 3.9-rc2)
Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (73b22ec Merge branch 'misc' into for-next)
Merging target-updates/for-next (04b59ba tcm_vhost: Enable VIRTIO_SCSI_F_HOTPLUG)
Merging target-merge/for-next-merge (b8d26b3 iser-target: Add iSCSI Extensions for RDMA (iSER) target driver)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (0b03930 Merge branch 'for-linus' into next)
Merging dmaengine/next (41ef2d5 Linux 3.9-rc7)
Merging net-next/master (20074f3 filter: fix va_list build error)
Applying: drivers:net: fix up for code movement from rt2x00pci.c
Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table)
Merging wireless-next/master (a8a48e6 Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next)
Merging bluetooth/master (975aba3 Bluetooth: Fix multiple LE socket handling)
Merging mtd/master (cdb6404 mtd: omap2: Use module_platform_driver())
Merging l2-mtd/master (98927a2 mtd: get the ECC info from the parameter page for ONFI nand)
Merging crypto/master (3862de1 crypto: caam - fix job ring cleanup code)
Merging drm/drm-next (b11b88e drm/i915: fix dmabuf vmap support)
Merging drm-intel/drm-intel-next-queued (dce3271 drm/i915: reference count for i915_hw_contexts)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
Merging sound/for-next (4ca231b ALSA: usb-audio: caiaq: fix endianness bug in snd_usb_caiaq_maschine_dispatch)
Merging sound-asoc/for-next (615973d Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus)
Merging modules/modules-next (a53a11f3 modpost: fix unwanted VMLINUX_SYMBOL_STR expansion)
CONFLICT (content): Merge conflict in include/asm-generic/unistd.h
Merging virtio/virtio-next (01d779a caif_virtio: Remove bouncing email addresses)
CONFLICT (content): Merge conflict in drivers/char/virtio_console.c
CONFLICT (modify/delete): Documentation/virtual/virtio-spec.txt deleted in virtio/virtio-next and modified in HEAD. Version HEAD of Documentation/virtual/virtio-spec.txt left in tree.
$ git rm -f Documentation/virtual/virtio-spec.txt
Merging input/next (0c6a616 Input: trackpoint - Optimize trackpoint init to use power-on reset)
Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in core)
Merging cgroup/for-next (2a0010a cpuset: fix compile warning when CONFIG_SMP=n)
Merging block/for-next (410fa26 Merge branch 'for-3.10/drivers' into for-next)
CONFLICT (content): Merge conflict in include/linux/blk_types.h
CONFLICT (content): Merge conflict in drivers/block/drbd/drbd_proc.c
Merging device-mapper/master (adf9566 Fix some typos in dm-space-map-metadata.c error messages.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (e4404fa mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE)
Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command)
Merging slab/for-next (14e50c6 mm: slab: Verify the nodeid passed to ____cache_alloc_node)
Merging uclinux/for-next (6dbe51c Linux 3.9-rc1)
Merging md/for-next (1fef8be raid5: make release_stripe lockless)
Merging mfd/master (99f4c6b mfd: si476x: Don't use 0bNNN)
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpuidle.c
Merging battery/master (6b17080 pm2301-charger: Fix suspend/resume)
Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning)
Merging regulator/for-next (bee5465 Merge remote-tracking branch 'regulator/topic/wm8994' into v3.9-rc8)
Merging security/next (b7ae9f0 Merge branch 'tpmdd-04-17-13' of git://github.com/shpedoikal/linux into my-next)
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (69c6612 watchdog: Fix race condition in registration code)
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
Merging iommu/next (d4df35e2 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu' and 'core' into next)
Merging vfio/next (664e938 vfio: Set container device mode)
Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (071361d mm: Convert print_symbol to %pSR)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device)
Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased)
Merging devicetree/devicetree/next (d347bc5 Merge branch 'robherring/for-next' from git://sources.calxeda.com/kernel/linux.git)
Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of initrd-end more explicit)
Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration)
Merging spi-mb/for-next (cd8d984 spi-topcliff-pch: fix to use list_for_each_entry_safe() when delete list items)
Merging tip/auto-latest (979830a Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in drivers/firmware/efi/efivars.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/efi-pstore.c
Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added)
Merging rcu/rcu/next (a9be854 Merge commit '6d87669357936bffa1e8fea7a4e7743e76905736' into next.2013.10.22a)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (4cee4b7 kvm: KVM_CAP_IOMMU only available with device assignment)
CONFLICT (content): Merge conflict in drivers/s390/kvm/virtio_ccw.c
CONFLICT (content): Merge conflict in arch/s390/mm/pgtable.c
Merging kvm-arm/kvm-arm-next (b8022d7 arm: kvm: arch_timer: use symbolic constants)
Merging kvm-ppc/kvm-ppc-next (8b78645 KVM: PPC: Book3S: Facilities to save/restore XICS presentation ctrler state)
Merging oprofile/for-next (23995bb oprofile, s390: Add support for IBM zEnterprise EC12)
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (6461b07 Merge branch 'stable/for-linus-3.10' into linux-next)
Merging xen-arm/linux-next (9bc25a1 xen/arm: remove duplicated include from enlighten.c)
Merging percpu/for-next (a1b2a55 percpu: add documentation on this_cpu operations)
Merging workqueues/for-next (46aed11 Merge branch 'for-3.10' into for-next)
Merging drivers-x86/linux-next (e6e5224 ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it)
CONFLICT (content): Merge conflict in drivers/platform/x86/chromeos_laptop.c
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (38a8179 Merge remote-tracking branch 'regmap/topic/range' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (df92d5f leds: leds-asic3: switch to using SIMPLE_DEV_PM_OPS)
Merging driver-core/driver-core-next (0d1d392 Merge 3.9-rc7 into driver-core-next)
Merging tty/tty-next (45efcb2 tty/serial/sirf: fix MODULE_DEVICE_TABLE)
Merging usb/usb-next (4626b8d USB: ehci-msm: USB_MSM_OTG needs USB_PHY)
Merging usb-gadget/next (added5f ARM: mxs_defconfig: add CONFIG_USB_PHY)
Merging staging/staging-next (a0eeed4 staging: comedi: ni_labpc: fix legacy driver build)
Merging char-misc/char-misc-next (0e27263 Tools: hv: Fix a checkpatch warning)
Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation)
CONFLICT (content): Merge conflict in drivers/block/Kconfig
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (d463f82 pinctrl: fix mutex deadlock in get_pinctrl_dev_from_of_node())
Merging vhost/linux-next (6713ce9 vhost: fix error handling in RESET_OWNER ioctl)
CONFLICT (content): Merge conflict in drivers/vhost/tcm_vhost.c
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (b977785 remoteproc: fix kconfig dependencies for VIRTIO)
CONFLICT (content): Merge conflict in drivers/remoteproc/Kconfig
Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO)
Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq)
Merging gpio/gpio/next (753c598 gpio/em: Add Device Tree support)
Merging gpio-lw/for-next (ab6ec0f gpio/omap: ensure gpio context is initialised)
Merging gen-gpio/for_next (f4c5405 gpio: update gpio Chinese documentation)
CONFLICT (modify/delete): drivers/usb/otg/Kconfig deleted in HEAD and modified in gen-gpio/for_next. Version gen-gpio/for_next of drivers/usb/otg/Kconfig left in tree.
CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
$ git rm -f drivers/usb/otg/Kconfig
Applying: gen-gpio: GPIOLIB merge fix up
Applying: merge fix for Convert selectors of GENERIC_GPIO to GPIOLIB
Applying: merge fix 2 for Convert selectors of GENERIC_GPIO to GPIOLIB
Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send())
Merging arm-soc/for-next (d664025 Merge branch 'next/multiplatform' into for-next)
CONFLICT (content): Merge conflict in drivers/usb/host/ohci-exynos.c
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-samsung.h
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-samsung.c
CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile
CONFLICT (modify/delete): drivers/gpio/gpio-vt8500.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/gpio/gpio-vt8500.c left in tree.
CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
CONFLICT (content): Merge conflict in arch/arm/plat-orion/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/tegra.c
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/hotplug.c
CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2443.c
CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2440.c
CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2412.c
CONFLICT (content): Merge conflict in arch/arm/mach-s3c24xx/dma-s3c2410.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
CONFLICT (modify/delete): arch/arm/mach-imx/cpufreq.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-imx/cpufreq.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9x5.dtsi
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
$ git rm -f drivers/gpio/gpio-vt8500.c arch/arm/mach-imx/cpufreq.c
Merging bcm2835/for-next (31880c3 Linux 3.9-rc6)
Merging cortex/for-next (4477ca4 ARM: ARMv7-M: Allow the building of new kernel port)
Merging ep93xx/ep93xx-for-next (7ec4429 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (3795b56 Merge branches 'mxs/dt-3.11' and 'imx/dt-3.11' into for-next)
Merging ixp4xx/next (19f949f Linux 3.8)
Merging msm/for-next (1df357a Merge branch 'msm-defconfig' into for-next)
Merging renesas/next (cda9c03 Merge branch 'heads/soc-sh73a0' into next)
CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
Merging samsung/for-next (e0f8f91 Merge branch 'next/late-exynos' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpuidle.c
Merging tegra/for-next (c0c1cb1 Merge branch 'for-3.10/defconfig' into for-next)
Merging dma-mapping/dma-mapping-next (a937536 Linux 3.9-rc3)
Merging pwm/for-next (affb923 pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config)
Merging dma-buf/for-next (b89e356 dma-buf: Add debugfs support)
Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem)
Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines)
Merging signal/for-next (99e621f syscalls.h: slightly reduce the jungles of macros)
Applying: cond_syscall and SYSCALL_ALIAS merge fixup
Merging clk/clk-next (1e43525 clk: add clk_ignore_unused option to keep boot clocks on)
Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock)
Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (0fbd067 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: revert "ipc: don't allocate a copy larger than max"
CONFLICT (content): Merge conflict in ipc/msg.c
Applying: drivers/char/random.c: fix priming of last_data
Applying: sound/soc/codecs/si476x.c: don't use 0bNNN
Applying: x86: make 'mem=' option to work for efi platform
Applying: kernel/auditfilter.c: tree and watch will memory leak when failure occurs
Applying: kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()
Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
Applying: drivers/video: implement a simple framebuffer driver
Applying: drivers-video-implement-a-simple-framebuffer-driver-fix
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: posix_cpu_timer: consolidate expiry time type
Applying: posix_cpu_timers: consolidate timer list cleanups
Applying: posix_cpu_timers: consolidate expired timers check
Applying: selftests: add basic posix timers selftests
CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile
Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
Applying: posix_timers: Fix racy timer delta caching on task exit
Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max
Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros
Applying: lglock: update lockdep annotations to report recursive local locks
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: vm: adjust ifdef for TINY_RCU
Applying: mm/SPARC: use common help functions to free reserved pages
Applying: mm, vmalloc: export vmap_area_list, instead of vmlist
Applying: mm, vmalloc: remove list management of vmlist after initializing vmalloc
Applying: clear_refs: sanitize accepted commands declaration
Applying: clear_refs-sanitize-accepted-commands-declaration-fix
Applying: clear_refs: introduce private struct for mm_walk
Applying: pagemap: introduce pagemap_entry_t without pmshift bits
Applying: pagemap: introduce the /proc/PID/pagemap2 file
Applying: mm: soft-dirty bits for user memory changes tracking
Applying: mem-soft-dirty: Reshuffle CONFIG_ options to be more Arch-friendly
Applying: mm: remove free_area_cache
Applying: include/linux/mmzone.h: cleanups
Applying: include-linux-mmzoneh-cleanups-fix
Applying: mm: memmap_init_zone() performance improvement
Applying: drop_caches: add some documentation and info message
Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
Applying: mm/dmapool.c: fix null dev in dma_pool_create()
Applying: memcg: debugging facility to access dangling memcgs
Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
Applying: mm: add vm event counters for balloon pages compaction
Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg
Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: drivers/rtc/rtc-v3020.c: use gpio_request_array()
Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue
Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix
Applying: drivers/rtc/rtc-pxa.c: use devm_* APIs
Applying: fat: additions to support fat_fallocate
Applying: fat-additions-to-support-fat_fallocate-fix
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: mwave: fix info leak in mwave_ioctl()
Applying: rapidio: make enumeration/discovery configurable
Applying: rapidio: add enumeration/discovery start from user space
Applying: rapidio: documentation update for enumeration changes
Applying: drivers/net: rename random32() to prandom_u32()
Applying: drivers-net-rename-random32-to-prandom_u32-fix
Applying: brcm80211: fix the misaligned indentation
Applying: remove unused random32() and srandom32()
Applying: random: fix accounting race condition with lockless irq entropy_count update
Applying: relay: fix timer madness
Applying: mm: remove old aio use_mm() comment
Applying: aio: remove dead code from aio.h
Applying: gadget: remove only user of aio retry
Applying: gadget-remove-only-user-of-aio-retry-checkpatch-fixes
Applying: aio: remove retry-based AIO
Applying: aio-remove-retry-based-aio-checkpatch-fixes
Applying: char: add aio_{read,write} to /dev/{null,zero}
Applying: aio: kill return value of aio_complete()
Applying: aio: add kiocb_cancel()
Applying: aio: move private stuff out of aio.h
Applying: aio: dprintk() -> pr_debug()
Applying: aio: do fget() after aio_get_req()
Applying: aio: make aio_put_req() lockless
Applying: aio-make-aio_put_req-lockless-checkpatch-fixes
Applying: aio: refcounting cleanup
Applying: aio-refcounting-cleanup-checkpatch-fixes
Applying: wait: add wait_event_hrtimeout()
Applying: aio: make aio_read_evt() more efficient, convert to hrtimers
Applying: aio-make-aio_read_evt-more-efficient-convert-to-hrtimers-checkpatch-fixes
Applying: aio: use flush_dcache_page()
Applying: aio: use cancellation list lazily
Applying: aio: change reqs_active to include unreaped completions
Applying: aio: kill batch allocation
Applying: aio: kill struct aio_ring_info
Applying: aio: give shared kioctx fields their own cachelines
Applying: aio: reqs_active -> reqs_available
Applying: aio: percpu reqs_available
Applying: generic dynamic per cpu refcounting
Applying: generic-dynamic-per-cpu-refcounting-checkpatch-fixes
Applying: generic-dynamic-per-cpu-refcounting-fix
Applying: aio: percpu ioctx refcount
Applying: aio: use xchg() instead of completion_lock
Applying: aio: don't include aio.h in sched.h
Applying: aio-dont-include-aioh-in-schedh-fix
Applying: aio: kill ki_key
Applying: aio: kill ki_retry
Applying: aio-kill-ki_retry-fix
Applying: aio-kill-ki_retry-checkpatch-fixes
Applying: block: prep work for batch completion
Applying: block-prep-work-for-batch-completion-checkpatch-fixes
Applying: block-prep-work-for-batch-completion-checkpatch merge fixes
Applying: block-prep-work-for-batch-completion-fix-2
Applying: block-prep-work-for-batch-completion-fix-3
Applying: block-prep-work-for-batch-completion-fix-3-fix
Applying: block-prep-work-for-batch-completion-fix-4
Applying: block-prep-work-for-batch-completion-fix-99
Applying: block, aio: batch completion for bios/kiocbs
Applying: block-aio-batch-completion-for-bios-kiocbs-checkpatch-fixes
Applying: block-aio-batch-completion-for-bios-kiocbs-fix
Applying: virtio-blk: convert to batch completion
Applying: mtip32xx: convert to batch completion
Applying: aio: fix kioctx not being freed after cancellation at exit time
Applying: decompressor: add LZ4 decompressor module
Applying: lib: add support for LZ4-compressed kernel
Applying: arm: add support for LZ4-compressed kernel
Applying: x86: add support for LZ4-compressed kernel
Applying: lib: add lz4 compressor module
Applying: lib-add-lz4-compressor-module-fix
Applying: crypto: add lz4 Cryptographic API
Applying: crypto-add-lz4-cryptographic-api-fix
Applying: seccomp: add generic code for jitted seccomp filters.
Applying: ARM: net: bpf_jit: make code generation less dependent on struct sk_filter.
Applying: ARM: net: bpf_jit: add support for jitted seccomp filters.
Applying: bpf: add comments explaining the schedule_work() operation
Merging akpm/master (a32e382 bpf: add comments explaining the schedule_work() operation)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: Tree for May 2 (platform/x86/samsung-laptop)

[Randy Dunlap]

On 05/02/13 00:35, Stephen Rothwell wrote:
> Hi all,
> 
> Please do not add any v3.11 destined work to your linux-next included
> branches until after v3.10-rc1 is released.
> 
> Changes since 20130501:
> 


when CONFIG_ACPI_VIDEO=m and CONFIG_SAMSUNG_LAPTOP=y:

drivers/built-in.o: In function `samsung_init':
samsung-laptop.c:(.init.text+0x94ba): undefined reference to `acpi_video_unregister'



-- 
~Randy

Re: linux-next: Tree for May 2 (platform/x86/toshiba_acpi)

[Randy Dunlap]

On 05/02/13 00:35, Stephen Rothwell wrote:
> Hi all,
> 
> Please do not add any v3.11 destined work to your linux-next included
> branches until after v3.10-rc1 is released.
> 
> Changes since 20130501:
> 

when TOSHIBA_ACPI=y and SERIO_I8042=m:

drivers/built-in.o: In function `toshiba_acpi_remove':
toshiba_acpi.c:(.text+0x29827a): undefined reference to `i8042_remove_filter'
drivers/built-in.o: In function `toshiba_acpi_add':
toshiba_acpi.c:(.text+0x298b8c): undefined reference to `i8042_install_filter'
toshiba_acpi.c:(.text+0x298c3b): undefined reference to `i8042_remove_filter'


-- 
~Randy

Re: linux-next: Tree for May 2 (platform/x86/samsung-laptop)

[Randy Dunlap]

On 05/02/13 14:26, Randy Dunlap wrote:
> On 05/02/13 00:35, Stephen Rothwell wrote:
>> Hi all,
>>
>> Please do not add any v3.11 destined work to your linux-next included
>> branches until after v3.10-rc1 is released.
>>
>> Changes since 20130501:
>>
> 
> 
> when CONFIG_ACPI_VIDEO=m and CONFIG_SAMSUNG_LAPTOP=y:
> 
> drivers/built-in.o: In function `samsung_init':
> samsung-laptop.c:(.init.text+0x94ba): undefined reference to `acpi_video_unregister'
> 
> 
> 

This build error still happens in linux-next of 20130719...

-- 
~Randy

Re: linux-next: Tree for May 2 (platform/x86/samsung-laptop)

[Greg Kroah-Hartman]

On Fri, Jul 19, 2013 at 10:19:14AM -0700, Randy Dunlap wrote:
> On 05/02/13 14:26, Randy Dunlap wrote:
> > On 05/02/13 00:35, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Please do not add any v3.11 destined work to your linux-next included
> >> branches until after v3.10-rc1 is released.
> >>
> >> Changes since 20130501:
> >>
> > 
> > 
> > when CONFIG_ACPI_VIDEO=m and CONFIG_SAMSUNG_LAPTOP=y:
> > 
> > drivers/built-in.o: In function `samsung_init':
> > samsung-laptop.c:(.init.text+0x94ba): undefined reference to `acpi_video_unregister'
> > 
> > 
> > 
> 
> This build error still happens in linux-next of 20130719...

I have not been the samsung-laptop driver maintainer for a few years
now, so there's nothing I can do about this, sorry.

greg k-h

linux-next: Tree for May 2

[Stephen Rothwell]

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

Hi all,

Changes since 20220429:

Trees added: mm-stable, mm-nonmm-stable

The net-next tree gained a confict against the net tree.

The input tree still had its build failure so I used the version from
next-20220426.

The iommu tree gained a confict against the dma-mapping tree.

The kvm tree lost its build failure.

The usb tree gained a build failure for which I reverted a commit.

The pinctrl tree gained a confict against the gpio-intel tree.

The folio tree gained a conflict against the btrfs tree and a semantic
conflict against the erofs tree.

The bitmap tree gained a build failure so I used the version from
next-20220429.

The mm tree gained conficts against the folio and slab trees and build
failures for which I reverted 14 commits.

Non-merge commits (relative to Linus' tree): 7315
 8088 files changed, 403991 insertions(+), 166098 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,
arm64, sparc and sparc64 defconfig and htmldocs. 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 347 trees (counting Linus' and 94 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 (672c0c517342 Linux 5.18-rc5)
Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging mm-hotfixes/mm-hotfixes-unstable (10663622a1e5 arm[64]/memremap: don't abuse pfn_valid() to ensure presence of linear map)
Merging kbuild-current/fixes (312310928417 Linux 5.18-rc1)
Merging arc-current/for-curr (c6ed4d84a2c4 ARC: remove redundant READ_ONCE() in cmpxchg loop)
Merging arm-current/fixes (9be4c88bb792 ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame())
Merging arm64-fixes/for-next/fixes (c35fe2a68f29 elf: Fix the arm64 MTE ELF segment name and value)
Merging arm-soc-fixes/arm/fixes (adee8aa22a92 Revert "arm: dts: at91: Fix boolean properties with values")
Merging drivers-memory-fixes/fixes (73039c6c7f36 memory: renesas-rpc-if: Fix HF/OSPI data transfer in Manual Mode)
Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
Merging m68k-current/for-linus (0d52a01a266b m68k: defconfig: Disable fbdev on Sun3/3x)
Merging powerpc-fixes/fixes (bb82c574691d powerpc/perf: Fix 32bit compile)
Merging s390-fixes/fixes (8b202ee21839 s390: disable -Warray-bounds)
Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX)
Merging net/master (79396934e289 net: dsa: b53: convert to phylink_pcs)
Merging bpf/master (a0df71948e95 tls: Skip tls_append_frag on zero copy size)
Merging ipsec/master (5bd8baab087d esp: limit skb_page_frag_refill use to a single page)
Merging netfilter/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too)
Merging ipvs/master (05ae2fba821c netfilter: nft_socket: make cgroup match work in input too)
Merging wireless/main (bb300130e47f ath11k: reduce the wait time of 11d scan and hw scan while add interface)
Merging rdma-fixes/for-rc (570a4bf7440e RDMA/rxe: Recheck the MR in when generating a READ reply)
Merging sound-current/for-linus (eb9d84b0ffe3 ALSA: fireworks: fix wrong return count shorter than expected by 4 bytes)
Merging sound-asoc-fixes/for-linus (3a129880c5de Merge remote-tracking branch 'asoc/for-5.17' into asoc-linus)
Merging regmap-fixes/for-linus (312310928417 Linux 5.18-rc1)
Merging regulator-fixes/for-linus (dfd2b37edf7e regulator: dt-bindings: Revise the rt5190a buck/ldo description)
Merging spi-fixes/for-linus (8868c03f3ca5 spi: spi-mem: check if data buffers are on stack)
Merging pci-current/for-linus (92597f97a40b PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold)
Merging driver-core.current/driver-core-linus (57ae8a492116 Merge tag 'driver-core-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging tty.current/tty-linus (57ae8a492116 Merge tag 'driver-core-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging usb.current/usb-linus (57ae8a492116 Merge tag 'driver-core-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (e23e50e7acc8 USB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS)
Merging phy/fixes (2c8045d48dee phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe())
Merging staging.current/staging-linus (ce522ba9ef7e Linux 5.18-rc2)
Merging iio-fixes/fixes-togreg (fe18894930a0 iio: mma8452: fix probe fail when device tree compatible is used.)
Merging counter-fixes/fixes-togreg (ce522ba9ef7e Linux 5.18-rc2)
Merging char-misc.current/char-misc-linus (57ae8a492116 Merge tag 'driver-core-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core)
Merging soundwire-fixes/fixes (312310928417 Linux 5.18-rc1)
Merging thunderbolt-fixes/fixes (af2d861d4cd2 Linux 5.18-rc4)
Merging input-current/for-linus (4352e23a7ff2 Input: cros-ec-keyb - only register keyboard if rows/columns exist)
Merging crypto-current/master (aa8e73eed7d3 crypto: x86/sm3 - Fixup SLS)
Merging vfio-fixes/for-linus (1ef3342a934e vfio/pci: Fix vf_token mechanism when device-specific VF drivers are used)
Merging kselftest-fixes/fixes (e8f0c8965932 selftest/vm: add skip support to mremap_test)
Merging modules-fixes/modules-linus (dc0ce6cc4b13 lib/test: use after free in register_test_dev_kmod())
Merging dmaengine-fixes/fixes (9889fc4f19e0 dmaengine: idxd: Fix the error handling path in idxd_cdev_register())
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (ba7542eb2dd5 mtd: rawnand: qcom: fix memory corruption that causes panic)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (d4cb77112c7b media: isl7998x: select V4L2_FWNODE to fix build error)
Merging reset-fixes/reset/fixes (03cb66463b55 dt-bindings: reset: Add parent "resets" property as optional)
Merging mips-fixes/mips-fixes (f0a6c68f6998 MIPS: Fix CP0 counter erratum detection for R4k CPUs)
Merging at91-fixes/at91-fixes (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles)
Merging omap-fixes/fixes (46ff3df87215 ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35)
Merging kvm-fixes/master (f751d8eac176 KVM: x86: work around QEMU issue with synthetic CPUID leaves)
Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu)
Merging hwmon-fixes/hwmon (08da09f02804 hwmon: (pmbus) delta-ahe50dc-fan: work around hardware quirk)
Merging nvdimm-fixes/libnvdimm-fixes (d28820419ca3 cxl/pci: Drop shadowed variable)
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
Merging btrfs-fixes/next-fixes (e4a747ad6e40 Merge branch 'misc-5.18' into next-fixes)
Merging vfs-fixes/fixes (9d2231c5d74e lib/iov_iter: initialize "flags" in new pipe_buffer)
Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
Merging drivers-x86-fixes/fixes (eb2fd9b43fae platform/x86/intel: pmc/core: change pmc_lpm_modes to static)
Merging samsung-krzk-fixes/fixes (436ce66003d5 ARM: s3c: mark as deprecated and schedule removal)
Merging pinctrl-samsung-fixes/fixes (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config)
Merging devicetree-fixes/dt/linus (e17fd4bf54fb dt-bindings: leds-mt6360: Drop redundant 'unevaluatedProperties')
Merging scsi-fixes/fixes (8be70a842f70 scsi: target: pscsi: Set SCF_TREAT_READ_AS_NORMAL flag only if there is valid data)
Merging drm-fixes/drm-fixes (9d9f720733b7 Merge tag 'amd-drm-fixes-5.18-2022-04-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (f7e1089f4376 drm/i915/fbc: Consult hw.crtc instead of uapi.crtc)
Merging mmc-fixes/fixes (4bc31edebde5 mmc: core: Set HS clock speed before sending HS CMD13)
Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
Merging gnss-fixes/gnss-linus (312310928417 Linux 5.18-rc1)
Merging hyperv-fixes/hyperv-fixes (eaa03d345358 Drivers: hv: vmbus: Replace smp_store_mb() with virt_store_mb())
Merging soc-fsl-fixes/fix (a222fd854139 soc: fsl: qe: Check of ioremap return value)
Merging risc-v-fixes/fixes (c6fe81191bd7 RISC-V: relocate DTB if it's outside memory region)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (312310928417 Linux 5.18-rc1)
Merging spdx/spdx-linus (312310928417 Linux 5.18-rc1)
Merging gpio-brgl-fixes/gpio/for-current (cc7328af2f85 gpiolib: of: fix bounds check for 'gpio-reserved-ranges')
Merging gpio-intel-fixes/fixes (0c2cae09a765 gpiolib: acpi: Convert type for pin to be unsigned)
Merging pinctrl-intel-fixes/fixes (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant)
Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (02c7efa43627 Documentation: kunit: fix path to .kunitconfig in start.rst)
Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb())
Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
Merging cel-fixes/for-rc (4d5004451ab2 SUNRPC: Fix the svc_deferred_event trace class)
Merging irqchip-fixes/irq/irqchip-fixes (544808f7e21c irqchip/gic, gic-v3: Prevent GSI to SGI translations)
Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
Merging perf-current/perf/urgent (8013d1d3d2e3 Merge tag 'soc-fixes-5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc)
Merging efi-fixes/urgent (9feaf8b387ee efi: fix return value of __setup handlers)
Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
Merging drm-misc-fixes/for-linux-next-fixes (dc3ae06c5f21 drm/sun4i: Remove obsolete references to PHYS_OFFSET)
Merging kbuild/for-next (3eb85539032f Makefile: fix 2 typos)
Merging perf/perf/core (e0c1b8f9eba8 Merge remote-tracking branch 'torvalds/master' into perf/core)
Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn)
Merging dma-mapping/for-next (3cb4503a3301 x86: remove cruft from <asm/dma-mapping.h>)
Merging asm-generic/master (fba2689ee77e Merge branch 'remove-h8300' of git://git.infradead.org/users/hch/misc into asm-generic)
CONFLICT (modify/delete): Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml deleted in asm-generic/master and modified in HEAD.  Version HEAD of Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml left in tree.
$ git rm -f Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.yaml
Merging arc/for-next (6aa98f621786 ARC: bpf: define uapi for BPF_PROG_TYPE_PERF_EVENT program type)
Merging arm/for-next (012d2fb6c8c9 Merge branch 'devel-stable' into for-next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
CONFLICT (content): Merge conflict in arch/arm/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/arm/include/asm/switch_to.h
CONFLICT (content): Merge conflict in arch/arm/kernel/traps.c
Merging arm64/for-next/core (c3adaa5c5c55 Merge branch 'for-next/kselftest' into for-next/core)
Merging arm-perf/for-next/perf (602c873eb52e perf: Replace acpi_bus_get_device())
Merging arm-soc/for-next (d8c5d0d2d566 soc:document merges)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in drivers/video/fbdev/omap/lcdc.c
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (ed532523b458 Merge branch 'v5.18/fixes' into for-next)
Merging aspeed/for-next (d9540eeaa3d1 Merge branches 'nuvoton-dt-for-v5.18' and 'dt-for-v5.18' into for-next)
Merging at91/at91-next (0c640d9544d0 ARM: dts: at91: fix pinctrl phandles)
Merging drivers-memory/for-next (d2fd434f2e1c Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (08021731ef7a Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (54715794cbcd Merge branch 'v5.18-next/soc' into for-next)
Merging mvebu/for-next (8885ae5142a4 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (930161749e64 Merge branch 'omap-for-v5.19/dt' into for-next)
Merging qcom/for-next (0b3dd1e94ac0 Merge branches 'arm64-for-5.19', 'arm64-defconfig-for-5.19', 'clk-for-5.19', 'defconfig-for-5.19', 'drivers-for-5.19', 'dts-for-5.19' and 'arm64-fixes-for-5.18' into for-next)
Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
Merging renesas/next (f8a7df6a1a04 Merge branch 'renesas-arm-dt-for-v5.19' into renesas-next)
Merging reset/reset/next (3f7bdc13154a dt-bindings: reset: uniphier-glue: Clean up clocks, resets, and their names using compatible string)
Merging rockchip/for-next (7aa1e0349129 Merge branch 'v5.19-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (96a93983e538 Merge branch 'for-v5.19/arm-dts64-cleanups' into for-next)
Merging scmi/for-linux-next (d291310bcf58 Merge branch 'for-next/ffa' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (448fb6ea127c ARM: dts: stm32: enable RTC support on stm32mp135f-dk)
Merging sunxi/sunxi/for-next (737a9ba0eeb8 Merge branch 'sunxi/fixes-for-5.18' into sunxi/for-next)
Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next)
Merging tegra/for-next (59ac218540e9 Merge branch for-5.19/arm64/defconfig into for-next)
Merging ti/ti-next (720b32f0f7bc Merge branch 'ti-k3-config-next' into ti-next)
Merging xilinx/for-next (312310928417 Linux 5.18-rc1)
Merging clk/clk-next (b473708bf4b5 Merge branch 'clk-airoha' into clk-next)
Merging clk-imx/for-next (39772efd98ad clk: imx8mp: Add DISP2 pixel clock)
Merging clk-renesas/renesas-clk (0ab55cf18341 clk: renesas: cpg-mssr: Add support for R-Car V4H)
Merging clk-samsung/for-next (45bd8166a1d8 clk: samsung: Add initial Exynos7885 clock driver)
Merging csky/linux-next (c5acdf12cc24 csky: atomic: Add conditional atomic operations' optimization)
Merging m68k/for-next (a96e4ebf3ded m68k: defconfig: Update defconfigs for v5.18-rc1)
Merging m68knommu/for-next (2954225f1484 m68k: coldfire: drop ISA_DMA_API support)
Merging microblaze/next (68cbfae83a72 microblaze: Add support for reserved memory defined by DT)
Merging mips/mips-next (7671f9674b47 mips: dts: ingenic: x1000: Add PWM device tree node)
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (862cf8d5fd98 openrisc/boot: Remove unnecessary initialisation in memcpy().)
Merging parisc-hd/for-next (e34799ccc126 parisc: Change MAX_ADDRESS to become unsigned long long)
Merging powerpc/next (ce522ba9ef7e Linux 5.18-rc2)
Merging soc-fsl/next (1ce93cb102e7 soc: fsl: qe: Check of ioremap return value)
Merging risc-v/for-next (d26eee72d9b9 riscv: dts: rename the node name of dma)
Merging s390/for-next (4ae59ba72cb5 Merge branch 'features' into for-next)
Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging uml/linux-next (82017457957a um: run_helper: Write error message to kernel log on exec failure on host)
Merging xtensa/xtensa-for-next (c8b222cfc804 xtensa: enable ARCH_HAS_DEBUG_VM_PGTABLE)
Merging pidfd/for-next (0014edaedfd8 fs: unset MNT_WRITE_HOLD on failure)
Merging fscrypt/master (a7a5bc5fe8ac fscrypt: log when starting to use inline encryption)
Merging fscache/fscache-next (312310928417 Linux 5.18-rc1)
Merging afs/afs-next (26291c54e111 Linux 5.17-rc2)
Merging btrfs/for-next (ee13d3e82868 Merge branch 'for-next-next-v5.18-20220429' into for-next-20220429)
Merging ceph/master (7acae6183cf3 ceph: fix possible NULL pointer dereference for req->r_session)
Merging cifs/for-next (a83b2a60011e cifs: flush all dirty pages to server before read/write)
Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem())
Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
Merging erofs/dev (011c045788ed erofs: add 'fsid' mount option)
Merging exfat/dev (1d404b899e32 exfat: reduce block requests when zeroing a cluster)
Merging ext3/for_next (cfb73d370782 Pull evictable fsnotify marks work from Amir.)
Merging ext4/dev (23e3d7f7061f jbd2: fix a potential race while discarding reserved buffers after an abort)
Merging f2fs/dev (6daa83cbee0d f2fs: extend stat_lock to avoid potential race in statfs)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (6b49bc9d8a5f fuse: avoid unnecessary spinlock bump)
Merging gfs2/for-next (db0c1968e935 gfs2: Variable rename)
Merging jfs/jfs-next (0d4837fdb796 fs: jfs: fix possible NULL pointer dereference in dbFree())
Merging ksmbd/ksmbd-for-next (22da5264abf4 Merge tag '5.18-rc3-ksmbd-fixes' of git://git.samba.org/ksmbd)
Merging nfs/linux-next (00c94ebec592 NFSv4: Don't invalidate inode attributes on delegation return)
Merging nfs-anna/linux-next (d19e0183a883 NFS: Do not report writeback errors in nfs_getattr())
Merging nfsd/for-next (5c2cb3833940 SUNRPC: Remove svc_rqst::rq_xprt_hlen)
Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED)
Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc())
Merging overlayfs/overlayfs-next (94fd19752b28 ovl: don't fail copy up if no fileattr support on upper)
Merging ubifs/next (705757274599 ubifs: rename_whiteout: correct old_dir size computing)
Merging v9fs/9p-next (22e424feb665 Revert "fs/9p: search open fids first")
Merging xfs/for-next (a44a027a8b2a Merge tag 'large-extent-counters-v9' of https://github.com/chandanr/linux into xfs-5.19-for-next)
Merging zonefs/for-next (31a644b3c2ae documentation: zonefs: Document sysfs attributes)
CONFLICT (content): Merge conflict in fs/zonefs/super.c
Merging iomap/iomap-for-next (ebb7fb1557b1 xfs, iomap: limit individual ioend chain lengths in writeback)
Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap)
Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes)
Merging vfs/for-next (fd78f28f9f50 Merge branch 'work.namei' into for-next)
Merging printk/for-next (bfc1f2749c23 Merge branch 'rework/kthreads' into for-next)
Merging pci/next (89905ffa4545 Merge branch 'remotes/lorenzo/pci/rockchip')
Merging pstore/for-next/pstore (8126b1c73108 pstore: Don't use semaphores in always-atomic-context code)
Merging hid/for-next (22d0912fc3fd Merge branch 'for-5.18/upstream-fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/hid/Kconfig
CONFLICT (content): Merge conflict in drivers/hid/Makefile
Merging i2c/i2c/for-next (05b42eff61a5 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (6cbf8b38dfe3 i3c: fix uninitialized variable use in i2c setup)
Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias)
Merging hwmon-staging/hwmon-next (8f8db4b5d10c hwmon: (asus-ec-sensors) add PRIME X470-PRO board)
Merging jc_docs/docs-next (81c653659d34 Documentation/sysctl: document max_rcu_stall_to_panic)
Merging v4l-dvb/master (3d59142ad94c media: dvb-usb: dib0700_devices: use an enum for the device number)
Merging v4l-dvb-next/master (6c1c1eb8c87d media: ext-ctrls-codec.rst: fix indentation)
Merging pm/linux-next (d3fa656ae5f3 Merge branch 'pm-cpuidle-next' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (a3b8d1b12c6b cpufreq: mediatek: Fix NULL pointer dereference in mediatek-cpufreq)
Merging cpupower/cpupower (312310928417 Linux 5.18-rc1)
Merging devfreq/devfreq-next (5d521a307526 PM / devfreq: rk3399_dmc: Avoid static (reused) profile)
Merging opp/opp/linux-next (3e1fac9324f8 dt-bindings: opp: opp-v2-kryo-cpu: Remove SMEM)
Merging thermal/thermal/linux-next (c07a7c8dbcd8 tools/thermal: Add thermal daemon skeleton)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (e425ac99b157 fs: dlm: cast resource pointer to uintptr_t)
Merging rdma/for-next (ff815a89398d RDMA/core: Avoid flush_workqueue(system_unbound_wq) usage)
Merging net-next/master (6e28f56c0d1d Merge branch 'adin1100-industrial-PHY-support')
CONFLICT (content): Merge conflict in tools/testing/selftests/net/forwarding/Makefile
Merging bpf-next/for-next (20b87e7c29df selftests/bpf: Fix two memory leaks in prog_tests)
Merging ipsec-next/master (b58b1f563ab7 xfrm: rework default policy structure)
Merging mlx5-next/mlx5-next (2984287c4c19 net/mlx5: Remove not-implemented IPsec capabilities)
Merging netfilter-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case)
Merging ipvs-next/master (0c7b27616fbd selftests: netfilter: add fib expression forward test case)
Merging bluetooth/master (a99a4899aae6 Bluetooth: btusb: Add a new PID/VID 0489/e0c8 for MT7921)
Merging wireless-next/main (5b3fd8fd7ceb rtw88: fix hw scan may cause disconnect issue)
Merging mtd/mtd/next (43823c5c56f2 mtd: cfi_cmdset_0002: Rename chip_ready variables)
Merging nand/nand/next (079d6348f3be Merge tag 'mtd/mtk-spi-nand-for-5.19' into nand/next)
Merging spi-nor/spi-nor/next (37841975b322 mtd: spi-nor: micron-st: Remove status polling on volatile registers write)
Merging crypto/master (11aeb93089ce hwrng: optee - remove redundant initialization to variable rng_size)
Merging drm/drm-next (15e2b419a837 Merge tag 'drm-misc-next-2022-04-28' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_sync.c
Merging drm-misc/for-linux-next (9ff9236394dd drm/panel: simple: Add Startek KD070WVFPA043-C069A panel support)
Merging amdgpu/drm-next (3da2c38231a4 drm/amdgpu: Free user pages if amdgpu_cs_parser_bos failed)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Applying: fix up for "drm/ttm: rework bulk move handling v5"
Merging drm-intel/for-linux-next (119125d96b8b Merge tag 'gvt-next-2022-04-29' of https://github.com/intel/gvt-linux into drm-intel-next)
Merging drm-tegra/drm/tegra/for-next (b53c24f69199 drm/tegra: Support YVYU, VYUY and YU24 formats)
Merging drm-msm/msm-next (78f815c1cf8f drm/msm: return the average load over the polling period)
Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
Merging etnaviv/etnaviv/next (2829a9fcb738 drm/etnaviv: reap idle softpin mappings when necessary)
Merging fbdev/for-next (f443e374ae13 Linux 5.17)
Merging regmap/for-next (d640947562ce regmap: cache: set max_register with reg_stride)
Merging sound/for-next (011b559be832 ALSA: pcm: Check for null pointer of pointer substream before dereferencing it)
Merging sound-asoc/for-next (180e66c028cb Merge remote-tracking branch 'asoc/for-5.19' into asoc-next)
Merging modules/modules-next (eb28e156bfd4 kallsyms: enhance %pS/s/b printing when KALLSYSMS is disabled)
Merging input/next (75e97ccaf557 Input: sun4i-lradc-keys - add support for R329 and D1)
$ git reset --hard HEAD^
Merging next-20220426 version of input
Merging block/for-next (14465fa75c5d Merge branch 'for-5.19/drivers' into for-next)
Merging device-mapper/for-next (e7ea9556985f dm: improve abnormal bio processing)
Merging libata/for-next (0cb63670d505 ata: Make use of the helper function devm_platform_ioremap_resource())
Merging pcmcia/pcmcia-next (3928cf08334e pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards)
Merging mmc/next (ac9d25557dcc mmc: core: Add CIDs for cards to the entropy pool)
Merging mfd/for-mfd-next (3474b838f420 dt-bindings: Drop undocumented i.MX iomuxc-gpr bindings in examples)
Merging backlight/for-backlight-next (023a8830a628 backlight: backlight: Slighly simplify devm_of_find_backlight())
Merging battery/for-next (312310928417 Linux 5.18-rc1)
Merging regulator/for-next (dae010473785 Merge remote-tracking branch 'regulator/for-5.19' into regulator-next)
Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
Merging apparmor/apparmor-next (c2489617b3b9 apparmor: Fix undefined reference to `zlib_deflate_workspacesize')
Merging integrity/next-integrity (891163adf180 ima: remove the IMA_TEMPLATE Kconfig option)
Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
Merging selinux/next (6a9e261cbbee selinux: don't sleep when CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE is true)
Merging smack/next (ba6b652bd863 smack: Remove redundant assignments)
Merging tomoyo/master (c806998d6e2c workqueue: Wrap flush_workqueue() using a macro)
Merging tpmdd/next (fad7eba9464e certs: Explain the rationale to call panic())
Merging watchdog/master (b2d229d4ddb1 Linux 5.18-rc3)
Merging iommu/next (85613addc0be Merge branches 'apple/dart', 'arm/msm', 'iommu/fixes', 'ppc/pamu', 'x86/amd', 'vfio-notifier-fix' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/amd/iommu.c
Merging audit/next (312310928417 Linux 5.18-rc1)
Merging devicetree/for-next (8274c8eae1d3 dt-bindings: fsl: convert fsl,layerscape-scfg to YAML)
Merging mailbox/mailbox-for-next (1b0d0f7c12d5 dt-bindings: mailbox: add definition for mt8186)
Merging spi/for-next (4b939e3a3e91 Merge remote-tracking branch 'spi/for-5.19' into spi-next)
Merging tip/master (aea1ae1ab93e Merge x86/cpu into tip/master)
CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt
CONFLICT (content): Merge conflict in kernel/sysctl.c
Merging clockevents/timers/drivers/next (49c14f94ccfe clocksource/drivers/timer-of: check return value of of_iomap in timer_of_base_init())
Merging edac/edac-for-next (5b5d65978dc3 Merge edac-misc into for-next)
Merging irqchip/irq/irqchip-next (4bde53ab3370 Merge branch irq/gpio-immutable into irq/irqchip-next)
Merging ftrace/for-next (c87857e21486 Merge branch 'trace/for-next-rtla' into trace/for-next)
Merging rcu/rcu/next (4ccb27d8a0f2 rcutorture: Simplify rcu_torture_read_exit_child() loop)
Merging kvm/next (71d7c575a673 Merge branch 'kvm-fixes-for-5.18-rc5' into HEAD)
Merging kvm-arm/next (4e6921a2e6c1 Merge branch kvm-arm64/hyp-stack-guard into kvmarm-master/next)
Merging kvms390/next (4aa5ac75bf79 KVM: s390: Fix lockdep issue in vm memop)
Merging xen-tip/linux-next (533bec143a4c arm/xen: Fix some refcount leaks)
Merging percpu/for-next (4e1f82dce05b Merge branch 'for-5.16-fixes' into for-next)
Merging workqueues/for-next (10a5a651e3af workqueue: Restrict kworker in the offline CPU pool running on housekeeping CPUs)
Merging drivers-x86/for-next (b0c07116c894 platform/x86: amd-pmc: Avoid reading SMU version at probe time)
Merging chrome-platform/for-next (57b888ca2541 platform/chrome: Re-introduce cros_ec_cmd_xfer and use it for ioctls)
Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe)
Merging leds/for-next (312310928417 Linux 5.18-rc1)
Merging ipmi/for-next (8d190578f326 ipmi: remove unnecessary type castings)
Merging driver-core/driver-core-next (f8ae07f4b8bf firmware_loader: Move definitions from sysfs_upload.h to sysfs.h)
Merging usb/usb-next (c40b62216c1a usb: core: hcd: Create platform devices for onboard hubs in probe())
CONFLICT (content): Merge conflict in drivers/usb/dwc3/drd.c
Merging thunderbolt/next (5dddb4169284 thunderbolt: Link USB4 ports to their USB Type-C connectors)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (312310928417 Linux 5.18-rc1)
Merging tty/tty-next (1e70d57e7285 ACPI / property: Document RS485 _DSD properties)
Merging char-misc/char-misc-next (e918c10265ef misc/pvpanic: Convert regular spinlock into trylock on panic path)
Merging coresight/next (c86dd9869128 coresight: etm4x: Cleanup TRCRSCTLRn register accesses)
Merging fpga/for-next (eee1071ee7df fpga: Use tab instead of space indentation)
Merging icc/icc-next (2c16d1b0fc5f Merge branch 'icc-const' into icc-next)
Merging iio/togreg (eda75f8238b0 iio: ti-ads8688: use of_device_id for OF matching)
Merging phy-next/next (f7f9abc5eab9 phy: freescale: imx8m-pcie: Handle IMX8_PCIE_REFCLK_PAD_UNUSED)
Merging soundwire/next (60657fb9b19d dt-bindings: soundwire: qcom: Add bindings for audio clock reset control property)
Merging extcon/extcon-next (ef799ab8dc5c extcon: Modify extcon device to be created after driver data is set)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/drd.c
Applying: fixup for "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
Merging gnss/gnss-next (312310928417 Linux 5.18-rc1)
Merging vfio/next (676d7cda1a3c Merge remote-tracking branch 'iommu/vfio-notifier-fix', tag 'gvt-next-2022-04-29' into v5.19/vfio/next-jgg)
Merging staging/staging-next (5fe7856ad59a staging: vt6655: Replace MACvReadISR with VNSvInPortD)
Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
Merging dmaengine/next (99faef48e7a3 dmaengine: mv_xor_v2 : Move spin_lock_bh() to spin_lock())
Merging cgroup/for-next (5c26993c31f0 cgroup: Add config file to cgroup selftest suite)
Merging scsi/for-next (a576d58bd4ac Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (cd186449fe1c scsi: sr: Add memory allocation failure handling for get_capabilities())
Merging vhost/linux-next (1c80cf031e02 vdpa: mlx5: synchronize driver status with CVQ)
Merging rpmsg/for-next (e8d9d4560c51 Merge branches 'rpmsg-next', 'rproc-next' and 'hwspinlock-next' into for-next)
Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
Merging gpio-brgl/gpio/for-next (fae74fb5d525 gpio: pcf857x: Make teardown callback return void)
Merging gpio-intel/for-next (edc5601db664 pinctrl: meson: Replace custom code by gpiochip_node_count() call)
Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
Merging pinctrl/for-next (a985730491d1 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
CONFLICT (content): Merge conflict in drivers/pinctrl/stm32/pinctrl-stm32.c
Merging pinctrl-intel/for-next (0be0b70df661 pinctrl: alderlake: Fix register offsets for ADL-N variant)
Merging pinctrl-renesas/renesas-pinctrl (f7bc5f52d235 pinctrl: renesas: rzg2l: Restore pin config order)
Merging pinctrl-samsung/for-next (ac875df4d854 pinctrl: samsung: fix missing GPIOLIB on ARM64 Exynos config)
Merging pwm/for-next (2bf8ee0faa98 dt-bindings: pwm: Add interrupts property for MediaTek MT8192)
Merging userns/for-next (9def41809e95 Merge of prlimit-tasklist_lock-for-v5.18, per-namespace-ipc-sysctls-for-v5.18, and ptrace-for-v5.18 for testing in linux-next)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (c7b607fa9325 selftests/resctrl: Fix null pointer dereference on open failed)
Merging livepatching/for-next (0e1b951d6de0 Merge branch 'for-5.18/selftests-fixes' into for-next)
Merging rtc/rtc-next (312310928417 Linux 5.18-rc1)
Merging nvdimm/libnvdimm-for-next (d43fae7c4d3e testing: nvdimm: asm/mce.h is not needed in nfit.c)
Merging at24/at24/for-next (312310928417 Linux 5.18-rc1)
Merging ntb/ntb-next (e9d0fa5e2482 IDT: Fix Build warnings on some 32bit architectures.)
Merging seccomp/for-next/seccomp (662340ef9218 selftests/seccomp: Ensure that notifications come in FIFO order)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging fsi/next (f2af60bb7ce2 fsi: Add trace events in initialization path)
Merging slimbus/for-next (54bf672111ee slimbus: qcom: Fix IRQ check in qcom_slim_probe)
Merging nvmem/for-next (0f07cbb92a28 nvmem: sfp: Add support for TA 2.1 devices)
Merging xarray/main (63b1898fffcd XArray: Disallow sibling entries of nodes)
Merging hyperv/hyperv-next (455880dfe292 PCI: hv: Fix hv_arch_irq_unmask() for multi-MSI)
Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy())
Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
Merging hmm/hmm (312310928417 Linux 5.18-rc1)
Merging kunit/test (312310928417 Linux 5.18-rc1)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging kunit-next/kunit (9bf2eed995f9 kunit: add support for kunit_suites that reference init code)
CONFLICT (content): Merge conflict in drivers/thunderbolt/test.c
CONFLICT (content): Merge conflict in net/mctp/test/route-test.c
CONFLICT (content): Merge conflict in security/apparmor/policy_unpack_test.c
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
Merging mhi/mhi-next (58043faa5f84 bus: mhi: pci_generic: add Telit FN980 v1 hardware revision)
Merging memblock/for-next (58ffc34896db memblock tests: Add TODO and README files)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
Merging cxl/next (280302f0e8f6 cxl/mbox: Replace NULL check with IS_ERR() after vmemdup_user())
Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.)
Merging efi/next (736e0f2179d3 efi/arm64: libstub: run image in place if randomized by the loader)
CONFLICT (content): Merge conflict in drivers/virt/Kconfig
CONFLICT (content): Merge conflict in drivers/virt/Makefile
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (609fae61ffea Merge branches 'slab/for-5.19/stackdepot' and 'slab/for-5.19/refactor' into slab/for-next)
Merging random/master (387342375435 random: mix in timestamps and reseed on system restore)
Merging landlock/next (312310928417 Linux 5.18-rc1)
Merging rust/rust-next (011150424cd9 rust: avoid all GCC plugins, not just the randstruct one)
CONFLICT (content): Merge conflict in Makefile
Merging sysctl/sysctl-next (a467257ffe4b kernel/kexec_core: move kexec_core sysctls into its own file)
CONFLICT (content): Merge conflict in kernel/rcu/rcu.h
Merging folio/for-next (00da6d4b7219 mm,fs: Remove stray references to ->readpage)
CONFLICT (content): Merge conflict in fs/btrfs/ctree.h
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
Applying: fix up for "btrfs: move btrfs_readpage to extent_io.c"
Applying: fixup for "mm,fs: Remove stray references to ->readpage"
Merging execve/for-next/execve (70578ff3367d binfmt_flat: Remove shared library support)
Merging bitmap/bitmap-for-next (d6407cd9a53c include/linux/find: Fix documentation)
$ git reset --hard HEAD^
Merging next-20220429 version of bitmap
Merging kspp/for-next/kspp (e6f3b3c9c109 cfi: Use __builtin_function_start)
Merging kspp-gustavo/for-next/kspp (6bf825b2731d Merge branch 'for-next/kspp-checkpatch' into for-next/kspp)
Merging mm-stable/mm-stable (059342d1dd4e mm/damon/reclaim: fix the timer always stays active)
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
Merging mm-nonmm-stable/mm-nonmm-stable (f6e2c20ca760 fs: sysv: check sbi->s_firstdatazone in complete_read_super)
Merging mm/mm-everything (cdb5a08f5c15 Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in mm/page_io.c
Applying: Revert "mm/shmem: convert shmem_swapin_page() to shmem_swapin_folio()"
Applying: Revert "mm/shmem: convert shmem_getpage_gfp to use a folio"
Applying: Revert "mm/shmem: convert shmem_alloc_and_acct_page to use a folio"
Applying: Revert "mm/shmem: turn shmem_alloc_page() into shmem_alloc_folio()"
Applying: Revert "mm/shmem: turn shmem_should_replace_page into shmem_should_replace_folio"
Applying: Revert "mm/shmem: convert shmem_add_to_page_cache to take a folio"
Applying: Revert "mm/swap: add folio_throttle_swaprate"
Applying: Revert "mm/shmem: use a folio in shmem_unused_huge_shrink"
Applying: Revert "vmscan: remove remaining uses of page in shrink_page_list"
Applying: Revert "vmscan: convert the activate_locked portion of shrink_page_list to folios"
Applying: Revert "vmscan: move initialisation of mapping down"
Applying: Revert "vmscan: convert lazy freeing to folios"
Applying: Revert "vmscan: convert page buffer handling to use folios"
Applying: Revert "vmscan: convert dirty page handling to folios"
Applying: Revert "usb: core: hcd: Create platform devices for onboard hubs in probe()"
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (e94e0f2f0f1f kselftest/vm: override TARGETS from arguments)

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

Re: linux-next: Tree for May 2

[Daniel Lezcano]

On 03/05/2019 00:03, Stephen Rothwell wrote:
> Hi Daniel,
> 
> On Thu, 2 May 2019 22:09:49 +0200 Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>>
>> Yes, I picked the patch and it was merged it via the tip tree [1] as
>> requested by Marc Zyngier [2] and notified [3].
>>
>> In any case, this patch should have go through my tree initially, so if
>> it is found somewhere else that's wrong.
>>
>> I did a respin of my branch and pushed it again in case there was
>> something wrong from it.
> 
> The patch ("clocksource/drivers/arch_timer: Workaround for Allwinner
> A64 timer instability") was merged into v5.1-rc1 via the tip tree as
> you say, however the version of your clockevents tree in yesterday's
> linux-next was based on v5.0-rc1 and contained the patch again ...
> 
> Today's should be better.

Oh, ok. As I updated the branch today before having this merge conflict
I thought the problem was coming from somewhere else. Thanks for the update.



-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: linux-next: Tree for May 2

[Stephen Rothwell]

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

Hi Daniel,

On Thu, 2 May 2019 22:09:49 +0200 Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>
> Yes, I picked the patch and it was merged it via the tip tree [1] as
> requested by Marc Zyngier [2] and notified [3].
> 
> In any case, this patch should have go through my tree initially, so if
> it is found somewhere else that's wrong.
> 
> I did a respin of my branch and pushed it again in case there was
> something wrong from it.

The patch ("clocksource/drivers/arch_timer: Workaround for Allwinner
A64 timer instability") was merged into v5.1-rc1 via the tip tree as
you say, however the version of your clockevents tree in yesterday's
linux-next was based on v5.0-rc1 and contained the patch again ...

Today's should be better.
-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: Tree for May 2

[Daniel Lezcano]

On 02/05/2019 21:08, Nathan Chancellor wrote:
> On Thu, May 02, 2019 at 09:00:58PM +0200, Anders Roxell wrote:
>> On Thu, 2 May 2019 at 12:10, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> Hi all,
>>>
>>> Changes since 20190501:
>>>
>>> The kbuild tree gained a conflict against Linus' tree.
>>>
>>> The f2fs tree gained a build failure for which I applied a patch.
>>>
>>> The net-next tree gained a conflict against the net tree.
>>>
>>> The pidfd tree gained a conflict against the kbuild tree.
>>>
>>> The akpm-current tree gained a conflict against the parisc-hd tree.
>>>
>>> Non-merge commits (relative to Linus' tree): 10425
>>>  10206 files changed, 459072 insertions(+), 301989 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 298 trees (counting Linus' and 69 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.

[ ... ]

>> Hi, I've noticed a build error if CONFIG_50I_ERRATUM_UNKNOWN1=y is enabled:
>>
>> ../drivers/clocksource/arm_arch_timer.c:402:20: error: redefinition of
>> ‘sun50i_a64_read_cntpct_el0’
>>  static u64 notrace sun50i_a64_read_cntpct_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../drivers/clocksource/arm_arch_timer.c:360:20: note: previous
>> definition of ‘sun50i_a64_read_cntpct_el0’ was here
>>  static u64 notrace sun50i_a64_read_cntpct_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../drivers/clocksource/arm_arch_timer.c:407:20: error: redefinition of
>> ‘sun50i_a64_read_cntvct_el0’
>>  static u64 notrace sun50i_a64_read_cntvct_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../drivers/clocksource/arm_arch_timer.c:365:20: note: previous
>> definition of ‘sun50i_a64_read_cntvct_el0’ was here
>>  static u64 notrace sun50i_a64_read_cntvct_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../drivers/clocksource/arm_arch_timer.c:412:20: error: redefinition of
>> ‘sun50i_a64_read_cntp_tval_el0’
>>  static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../drivers/clocksource/arm_arch_timer.c:370:20: note: previous
>> definition of ‘sun50i_a64_read_cntp_tval_el0’ was here
>>  static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../drivers/clocksource/arm_arch_timer.c:417:20: error: redefinition of
>> ‘sun50i_a64_read_cntv_tval_el0’
>>  static u32 notrace sun50i_a64_read_cntv_tval_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../drivers/clocksource/arm_arch_timer.c:375:20: note: previous
>> definition of ‘sun50i_a64_read_cntv_tval_el0’ was here
>>  static u32 notrace sun50i_a64_read_cntv_tval_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../drivers/clocksource/arm_arch_timer.c:375:20: warning:
>> ‘sun50i_a64_read_cntv_tval_el0’ defined but not used
>> [-Wunused-function]
>> ../drivers/clocksource/arm_arch_timer.c:370:20: warning:
>> ‘sun50i_a64_read_cntp_tval_el0’ defined but not used
>> [-Wunused-function]
>>  static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
>>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> make[3]: *** [../scripts/Makefile.build:279:
>> drivers/clocksource/arm_arch_timer.o] Error 1
>> make[3]: Target '__build' not remade because of errors.
>> make[2]: *** [../scripts/Makefile.build:489: drivers/clocksource] Error 2
>>
>> I think commit c950ca8c35ee ("clocksource/drivers/arch_timer:
>> Workaround for Allwinner A64 timer instability") introduced the issue.
>>
>> Cheers,
>> Anders
> 
> It actually looks like it is the clocksource tree merge that causes it:
> 
> https://git.kernel.org/next/linux-next/c/5e70bc4029d33b14a6cee87707e7b402801ca310
> 
> Since that commit exists in two different trees.

Yes, I picked the patch and it was merged it via the tip tree [1] as
requested by Marc Zyngier [2] and notified [3].

In any case, this patch should have go through my tree initially, so if
it is found somewhere else that's wrong.

I did a respin of my branch and pushed it again in case there was
something wrong from it.

Thanks

  -- Daniel

[1] https://lkml.org/lkml/2019/3/5/274
[2] https://lkml.org/lkml/2019/1/14/122
[3] https://lkml.org/lkml/2019/1/14/381

-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: linux-next: Tree for May 2

[Nathan Chancellor]

On Thu, May 02, 2019 at 09:00:58PM +0200, Anders Roxell wrote:
> On Thu, 2 May 2019 at 12:10, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Changes since 20190501:
> >
> > The kbuild tree gained a conflict against Linus' tree.
> >
> > The f2fs tree gained a build failure for which I applied a patch.
> >
> > The net-next tree gained a conflict against the net tree.
> >
> > The pidfd tree gained a conflict against the kbuild tree.
> >
> > The akpm-current tree gained a conflict against the parisc-hd tree.
> >
> > Non-merge commits (relative to Linus' tree): 10425
> >  10206 files changed, 459072 insertions(+), 301989 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 298 trees (counting Linus' and 69 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 (65beea4c3a52 Merge tag 'arc-5.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc)
> > Merging fixes/master (1995fa480636 kernel/compat.c: mark expected switch fall-throughs)
> > Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs)
> > Merging kbuild-current/fixes (79a3aaa7b82e Linux 5.1-rc3)
> > Merging arc-current/for-curr (55c0c4c793b5 ARC: memset: fix build with L1_CACHE_SHIFT != 6)
> > Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache)
> > Merging arm64-fixes/for-next/fixes (4e69ecf4da1e arm64/module: ftrace: deal with place relative nature of PLTs)
> > Merging m68k-current/for-linus (28713169d879 m68k: Add -ffreestanding to CFLAGS)
> > Merging powerpc-fixes/fixes (7a3a4d763837 powerpc/mm_iommu: Allow pinning large regions)
> > Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list)
> > Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
> > Merging net/master (886b7a50100a ipv6: A few fixes on dereferencing rt->from)
> > Merging bpf/master (b9aa0b35d878 bpf, x32: Fix bug for BPF_ALU64 | BPF_NEG)
> > Merging ipsec/master (837f74116585 xfrm: update doc about xfrm[46]_gc_thresh)
> > Merging netfilter/master (33cc3c0cfa64 netfilter: nf_flow_table: check ttl value in flow offload data path)
> > Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects)
> > Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
> > Merging mac80211/master (517879147493 mac80211: don't attempt to rename ERR_PTR() debugfs dirs)
> > Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db)
> > Merging sound-current/for-linus (3887c26c0e24 ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR)
> > Merging sound-asoc-fixes/for-linus (952f0986cc51 Merge branch 'asoc-5.1' into asoc-linus)
> > Merging regmap-fixes/for-linus (7fdc9fc87492 Merge branch 'regmap-5.1' into regmap-linus)
> > Merging regulator-fixes/for-linus (222d7eef42eb Merge branch 'regulator-5.1' into regulator-linus)
> > Merging spi-fixes/for-linus (9f2487a2ae45 Merge branch 'spi-5.1' into spi-linus)
> > Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off))
> > Merging driver-core.current/driver-core-linus (79a3aaa7b82e Linux 5.1-rc3)
> > Merging tty.current/tty-linus (085b7755808a Linux 5.1-rc6)
> > Merging usb.current/usb-linus (c114944d7d67 USB: w1 ds2490: Fix bug caused by improper use of altsetting array)
> > Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write())
> > Merging usb-serial-fixes/usb-linus (79a3aaa7b82e Linux 5.1-rc3)
> > Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
> > Merging phy/fixes (e6f32efb1b12 phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode)
> > Merging staging.current/staging-linus (085b7755808a Linux 5.1-rc6)
> > Merging char-misc.current/char-misc-linus (24f1bc280bce misc: rtsx: Fixed rts5260 power saving parameter and sd glitch)
> > Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
> > Merging thunderbolt-fixes/fixes (37624b58542f Linux 5.1-rc7)
> > Merging input-current/for-linus (3a349763cf11 Input: synaptics-rmi4 - write config register values to the right offset)
> > Merging crypto-current/master (b257b48cd583 crypto: lrw - Fix atomic sleep when walking skcipher)
> > Merging ide/master (dc5c37736d16 drivers: ide: Kconfig: pedantic formatting)
> > Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container)
> > Merging kselftest-fixes/fixes (15ade5d2e777 Linux 5.1-rc4)
> > Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
> > Merging slave-dma-fixes/fixes (37624b58542f Linux 5.1-rc7)
> > Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
> > Merging mtd-fixes/mtd/fixes (9a8f612ca0d6 mtd: rawnand: marvell: Clean the controller state before each operation)
> > Merging mfd-fixes/for-mfd-fixes (a05a2e7998ab mfd: sun6i-prcm: Allow to compile with COMPILE_TEST)
> > Merging v4l-dvb-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
> > Merging reset-fixes/reset/fixes (13e8a05b9224 reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev)
> > Merging mips-fixes/mips-fixes (a1e8783db8e0 MIPS: perf: ath79: Fix perfcount IRQ assignment)
> > Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak)
> > Merging omap-fixes/fixes (6a38df676a0a ARM: dts: logicpd-som-lv: Fix MMC1 card detect)
> > Merging kvm-fixes/master (e8ab8d24b488 KVM: nVMX: Fix size checks in vmx_set_nested_state)
> > Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity)
> > Merging hwmon-fixes/hwmon (b88c5049219a hwmon: (occ) Fix extended status bits)
> > Merging nvdimm-fixes/libnvdimm-fixes (a7de824d947a Merge branch 'for-5.1/dax' into libnvdimm-for-next)
> > Merging btrfs-fixes/next-fixes (38464fdaacb5 Merge branch 'misc-5.1' into next-fixes)
> > Merging vfs-fixes/fixes (f69e749a4935 Abort file_remove_privs() for non-reg. files)
> > Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry)
> > Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry)
> > Merging drivers-x86-fixes/fixes (57f634b76a95 platform/x86: dell-laptop: fix rfkill functionality)
> > Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
> > Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1)
> > Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds)
> > Merging scsi-fixes/fixes (144ec97493af scsi: aic7xxx: fix EISA support)
> > Merging drm-fixes/drm-fixes (37624b58542f Linux 5.1-rc7)
> > Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family)
> > Merging drm-intel-fixes/for-linux-next-fixes (f5c58ba18ab8 drm/i915: Restore correct bxt_ddi_phy_calc_lane_lat_optim_mask() calculation)
> > Merging mmc-fixes/fixes (dc4060a5dc25 Linux 5.1-rc5)
> > Merging rtc-fixes/rtc-fixes (882c5e552ffd rtc: da9063: set uie_unsupported when relevant)
> > Merging gnss-fixes/gnss-linus (79a3aaa7b82e Linux 5.1-rc3)
> > Merging hyperv-fixes/hyperv-fixes (a0033bd1eae4 Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup())
> > Merging drm-misc-fixes/for-linux-next-fixes (ab042b824c11 Revert "drm/qxl: drop prime import/export callbacks")
> > Merging kbuild/for-next (f711b2ddcf08 Merge branch 'kconfig' into for-next)
> > CONFLICT (content): Merge conflict in Makefile
> > Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7)
> > Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
> > Merging dma-mapping/for-next (148a97d5a02a dma-mapping: remove an unnecessary NULL check)
> > Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores)
> > Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8)
> > Merging arm/for-next (3d3c616177cc Merge branches 'fixes' and 'misc' into for-next)
> > Merging arm64/for-next/core (a8f7ce5a9fbc Merge branch 'for-next/mmiowb' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core)
> > CONFLICT (content): Merge conflict in arch/arm64/include/asm/futex.h
> > Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling)
> > Merging arm-soc/for-next (c19ddad91159 ARM: Document merges)
> > Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
> > Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
> > Merging amlogic/for-next (14248aa919f9 Merge branch 'v5.2/drivers' into tmp/aml-rebuild)
> > Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1)
> > Merging at91/at91-next (ac650130c227 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
> > CONFLICT (content): Merge conflict in arch/arm/mach-at91/pm.c
> > Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next)
> > Merging imx-mxs/for-next (7119403f9617 Merge branch 'imx/defconfig' into for-next)
> > CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
> > Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next)
> > Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
> > Merging mvebu/for-next (891f0f865c37 Merge branch 'mvebu/dt64' into mvebu/for-next)
> > Merging omap/for-next (ef2989fe20d8 Merge branch 'fixes' into for-next)
> > Merging reset/reset/next (d005aa750c9b reset: fix linux/reset.h errors)
> > Merging qcom/for-next (1d31c0b1a28a Merge tag 'qcom-arm64-for-5.2-1' into really-done-for-5.2)
> > Merging renesas/next (982700f80241 Merge branch 'arm-dt-for-v5.2' into next)
> > Merging rockchip/for-next (9c539071723e Merge branch 'v5.2-clk/next' into for-next)
> > Merging samsung/for-next (bebc6082da0a Linux 4.14)
> > Merging samsung-krzk/for-next (831c75782772 Merge branch 'next/dt64' into for-next)
> > Merging sunxi/sunxi/for-next (613c4ce8fddb Merge branch 'sunxi/dt-for-5.2' into sunxi/for-next)
> > Merging tegra/for-next (b31c477a9892 Merge branch for-5.2/arm64/defconfig into for-next)
> > Merging clk/clk-next (61d9707c08e7 Merge branch 'clk-imx' into clk-next)
> > Merging clk-samsung/for-next (3c297d9e65d8 clk: samsung: exynos5410: Add gate clock for ADC)
> > Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
> > Merging csky/linux-next (a691f3334d58 csky/syscall_trace: Fixup return processing flow)
> > Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
> > Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
> > Merging m68k/for-next (733df11cfc36 m68k: defconfig: Update defconfigs for v5.1-rc1)
> > Merging m68knommu/for-next (37624b58542f Linux 5.1-rc7)
> > Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
> > Merging mips/mips-next (cf0c4876684d mips: Combine memblock init and memory reservation loops)
> > Merging nds32/next (83f7b748f739 nds32: fix asm/syscall.h)
> > Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE)
> > Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
> > Merging parisc-hd/for-next (2b731a920986 parisc: Update huge TLB page support to use per-pagetable spinlock)
> > Merging powerpc/next (26ad26718dfa powerpc/mm: Fix section mismatch warning)
> > Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
> > Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
> > Merging risc-v/for-next (fd7f744caed8 riscv: vdso: drop unnecessary cc-ldoption)
> > Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
> > Merging s390/features (7a5da02de8d6 locking/lockdep: check for freed initmem in static_obj())
> > Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
> > Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
> > Merging uml/linux-next (aea05eb56e47 um: Fix for a possible OOPS in ubd initialization)
> > Merging xtensa/xtensa-for-next (a26a70426e9b Merge branch 'xtensa-5.1-fixes' into xtensa-for-next)
> > Merging fscrypt/master (2c58d548f570 fscrypt: cache decrypted symlink target in ->i_link)
> > 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 (6033347bcdd8 Merge branch 'for-next-stale-20190425' into for-next-20190425)
> > Merging ceph/master (37659182bff1 ceph: fix ci->i_head_snapc leak)
> > Merging cifs/for-next (838a20335ea5 cifs: update module internal version number)
> > Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
> > Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file)
> > Merging ext3/for_next (91e9f2c1d861 Merge quota fix from Chengguang.)
> > Merging ext4/dev (7403c629f6c8 ext4: fix ext4_show_options for file systems w/o journal)
> > Merging f2fs/dev (90a238561901 f2fs: add tracepoint for f2fs_filemap_fault())
> > Applying: f2fs: fix up for "f2fs: add tracepoint for f2fs_filemap_fault()"
> > Merging fuse/for-next (6407f44aaf2a fuse: Add ioctl flag for x32 compat ioctl)
> > Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
> > Merging nfs/linux-next (f2bc9c908dfe Merge tag 'fsnotify_for_v5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
> > Merging nfs-anna/linux-next (b422df915cef lockd: Store the lockd client credential in struct nlm_host)
> > Merging nfsd/nfsd-next (5926459e7c89 locks: move checks from locks_free_lock() to locks_release_private())
> > Merging orangefs/for-next (7dccb4027ef9 orangefs: copy Orangefs-sized blocks into the pagecache if possible.)
> > Merging overlayfs/overlayfs-next (993a0b2aec52 ovl: Do not lose security.capability xattr over metadata file copy-up)
> > Merging ubifs/linux-next (5578e48e5c0b ubi: wl: Silence uninitialized variable warning)
> > Merging v9fs/9p-next (bb06c388fa20 9p/net: fix memory leak in p9_client_create)
> > Merging xfs/for-next (f00b8b784f75 Merge remote-tracking branch 'korg/iomap-5.2-merge' into for-next)
> > Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check)
> > Merging vfs/for-next (af467ef6c590 Merge branches 'work.misc' and 'work.dcache' into for-next)
> > Merging printk/for-next (3ba3fee931aa Merge branch 'for-5.2-vsprintf-hardening' into for-next)
> > CONFLICT (content): Merge conflict in mm/memblock.c
> > CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h
> > CONFLICT (content): Merge conflict in drivers/base/power/main.c
> > Merging pci/next (e564375c4460 Merge branch 'pci/trivial')
> > Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write)
> > Merging hid/for-next (eb18d1215405 Merge branch 'for-5.2/logitech' into for-next)
> > Merging i2c/i2c/for-next (5dc8e322f1a8 Merge branch 'i2c/for-current-fixed' into i2c/for-next)
> > Merging i3c/i3c/next (124dbd750da4 i3c: master: dw: remove dead code from dw_i3c_master_*_xfers())
> > Merging dmi/master (57361846b52b Linux 4.19-rc2)
> > Merging hwmon-staging/hwmon-next (a60170000338 hwmon: (s3c) Use dev_get_drvdata())
> > Merging jc_docs/docs-next (41f0a9542a25 docs/vm: Minor editorial changes in the THP and hugetlbfs)
> > Merging v4l-dvb/master (7afa8db323e3 media: vsp1: Add support for missing 16-bit RGB555 formats)
> > Merging v4l-dvb-next/master (9e98c678c2d6 Linux 5.1-rc1)
> > Merging fbdev/fbdev-for-next (261ac4ddfa9f video: fbdev: atmel_lcdfb: remove set but not used variable 'pdata')
> > Merging pm/linux-next (ff9cb8b1104e Merge branch 'pm-cpufreq' into linux-next)
> > Merging cpufreq-arm/cpufreq/arm/linux-next (8db82563451f cpufreq: armada-37xx: fix frequency calculation for opp)
> > Merging cpupower/cpupower (21027e78e7c1 cpupower: correct spelling of interval)
> > Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt())
> > Merging thermal/next (c5e7be3b089d Merge branches 'thermal-core' and 'thermal-intel' into next)
> > Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5)
> > Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
> > Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces)
> > Merging swiotlb/linux-next (8395c154abb7 swiotlb: dump used and total slots when swiotlb buffer is full (v2))
> > Merging rdma/for-next (b9b0f34531e0 uverbs: Convert idr to XArray)
> > Merging net-next/master (f76c4b571fee Merge branch 'net-mvpp2-cls-Add-classification')
> > CONFLICT (content): Merge conflict in net/ipv6/route.c
> > CONFLICT (content): Merge conflict in net/ipv4/xfrm4_policy.c
> > CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
> > CONFLICT (content): Merge conflict in .mailmap
> > Merging bpf-next/master (2b5bc3c8ebce r8169: remove manual autoneg restart workaround)
> > Merging ipsec-next/master (bb9cd077e216 xfrm: remove unneeded export_symbols)
> > Applying: xfrm4: fix up for moved _decode_session4
> > Merging mlx5-next/mlx5-next (91a40a48d52d net/mlx5: Fix broken hca cap offset)
> > CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c
> > Merging netfilter-next/master (1de6f3342191 netfilter: connlabels: fix spelling mistake "trackling" -> "tracking")
> > Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
> > Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols)
> > Merging wireless-drivers-next/master (5a489b99ecbc Merge tag 'mt76-for-kvalo-2019-05-01' of https://github.com/nbd168/wireless)
> > CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/fw/file.h
> > Merging bluetooth/master (aa5658534f4f dt-bindings: net: bluetooth: Add device tree bindings for QTI chip WCN3998)
> > Merging mac80211-next/master (88d6272acaaa net: phy: avoid unneeded MDIO reads in genphy_read_status)
> > Merging gfs2/for-next (08b22006ad4e gfs2: Fix iomap write page reclaim deadlock)
> > Merging mtd/mtd/next (9e98c678c2d6 Linux 5.1-rc1)
> > Merging nand/nand/next (1c14fe2167ef mtd: nandsim: switch to exec_op interface)
> > Merging spi-nor/spi-nor/next (dcb4b22eeaf4 spi-nor: s25fl512s supports region locking)
> > Merging crypto/master (1036633e10f8 crypto: ecrdsa - select ASN1 and OID_REGISTRY for EC-RDSA)
> > Merging drm/drm-next (060cebb20cdb drm: introduce a capability flag for syncobj timeline support)
> > CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_drv.h
> > CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_drv.c
> > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbdev.c
> > Applying: drm/virtio: fix up bad merge of virtgpu_gem_prime_get_sg_table
> > Merging amdgpu/drm-next (9cf211b86430 drm/amdkfd: Adjust weight to represent num_hops info when report xgmi iolink)
> > Merging drm-intel/for-linux-next (9628e15ca9d5 drm/i915/icl: Whitelist GEN9_SLICE_COMMON_ECO_CHICKEN1)
> > Merging drm-tegra/drm/tegra/for-next (61b51fb51c01 drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages())
> > Merging drm-misc/for-linux-next (761e473f6b23 drm/gem: Fix sphinx warnings)
> > Merging drm-msm/msm-next (b02872df58ac drm/msm/a6xx: Don't enable GPU state code if dependencies are missing)
> > Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
> > Merging mali-dp/for-upstream/mali-dp (ed94cfab195f drm/komeda: Use memset to initialize config_id)
> > Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature)
> > Merging etnaviv/etnaviv/next (fd2450a77d33 drm/etnaviv: clean up etnaviv_gem_new_handle)
> > Merging kconfig/for-next (bebc6082da0a Linux 4.14)
> > Merging regmap/for-next (615c4d9a50e2 Merge branch 'regmap-5.2' into regmap-next)
> > Merging sound/for-next (f495222e2827 ALSA: hda - Register irq handler after the chip initialization)
> > Merging sound-asoc/for-next (5b89c74d6724 Merge branch 'asoc-5.2' into asoc-next)
> > CONFLICT (content): Merge conflict in MAINTAINERS
> > Merging modules/modules-next (fde1bd9b0ceb kernel/module: Reschedule while waiting for modules to finish loading)
> > Merging input/next (7b5bb55d0dad Input: add support for Azoteq IQS550/572/525)
> > CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
> > Merging block/for-next (33a213b75fd5 Merge branch 'for-5.2/block' into for-next)
> > Merging device-mapper/for-next (940bc471780b dm mpath: always free attached_handler_name in parse_path())
> > Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
> > Merging mmc/next (7a8b9daf7ea6 mmc: omap_hsmmc: Use dev_get_drvdata())
> > Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
> > CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
> > Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
> > Merging mfd/for-mfd-next (7f042743306c mfd: cros_ec: Instantiate the CrOS USB PD logger driver)
> > Merging backlight/for-backlight-next (a6d6a589cb09 video: lcd: Remove useless BACKLIGHT_CLASS_DEVICE dependencies)
> > Merging battery/for-next (61e93655fc30 power: supply: core: Add missing documentation for CHARGE_CONTROL_* properties)
> > Merging regulator/for-next (5d8a6506ef59 Merge branch 'regulator-5.2' into regulator-next)
> > Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing)
> > Merging apparmor/apparmor-next (058c4f342582 apparmor: fix spelling mistake "immutible" -> "immutable")
> > Merging integrity/next-integrity (a2ffe5774e8e selftests/kexec: update get_secureboot_mode)
> > Merging selinux/next (35a196bef449 proc: prevent changes to overridden credentials)
> > CONFLICT (content): Merge conflict in scripts/selinux/mdp/mdp.c
> > Merging tpmdd/next (ff89e2f4b34d tpm: Actually fail on TPM errors during "get random")
> > Merging watchdog/master (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through)
> > Merging iommu/next (398ece5bde7e Merge branches 'arm/tegra', 'arm/mediatek', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
> > Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
> > Merging vfio/next (41be3e261817 vfio: Fix WARNING "do not call blocking ops when !TASK_RUNNING")
> > Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
> > Merging audit/next (70c4cf17e445 audit: fix a memory leak bug)
> > CONFLICT (content): Merge conflict in kernel/seccomp.c
> > CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
> > Merging devicetree/for-next (440868661f36 of: fix clang -Wunsequenced for be32_to_cpu())
> > Merging mailbox/mailbox-for-next (17b860bbfc84 mailbox: imx: keep MU irq working during suspend/resume)
> > Merging spi/for-next (2e5f081003f0 Merge branch 'spi-5.2' into spi-next)
> > Merging tip/auto-latest (bc94903cc4a3 Merge branch 'core/core')
> > CONFLICT (content): Merge conflict in mm/kasan/Makefile
> > CONFLICT (content): Merge conflict in arch/x86/kernel/irq_64.c
> > CONFLICT (content): Merge conflict in arch/s390/include/asm/Kbuild
> > CONFLICT (content): Merge conflict in arch/arm64/include/asm/Kbuild
> > Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210)
> > Merging edac-amd/for-next (74676a8e247a arm64: dts: stratix10: Use new Stratix10 EDAC bindings)
> > Merging irqchip/irq/irqchip-next (009669e74813 arm64: arch_k3: Enable interrupt controller drivers)
> > Merging ftrace/for-next (070ea1a24f40 function_graph: Place ftrace_graph_entry_stub() prototype in include/linux/ftrace.h)
> > Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits)
> > Merging kvm/linux-next (3a1e5e4a2c7a Revert "KVM: doc: Document the life cycle of a VM and its resources")
> > Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic)
> > Merging kvm-ppc/kvm-ppc-next (0caecf5b0019 KVM: PPC: Book3S HV: XIVE: Clear escalation interrupt pointers on device close)
> > CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
> > Merging kvms390/next (b2d0371d2e37 KVM: s390: vsie: Return correct values for Invalid CRYCB format)
> > Merging xen-tip/linux-next (72813bfbf027 xen/pvh: correctly setup the PV EFI interface for dom0)
> > Merging percpu/for-next (cb453ce4846b Merge branch 'for-5.2' into for-next)
> > Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu)
> > Merging drivers-x86/for-next (98e2630284ab platform/x86: alienware-wmi: fix kfree on potentially uninitialized pointer)
> > Merging chrome-platform/for-next (cdb80268a6b5 platform/chrome: wilco_ec: Add property helper library)
> > Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings)
> > Merging leds/for-next (05b8ccfba5d4 ALSA: line6: Avoid polluting led_* namespace)
> > Merging ipmi/for-next (ed6c3a6d8996 ipmi: Remove warning if no slave address is present)
> > Merging driver-core/driver-core-next (391c0325cc5f Revert "driver core: platform: Fix the usage of platform device name(pdev->name)")
> > CONFLICT (content): Merge conflict in block/blk-sysfs.c
> > Merging usb/usb-next (ce64cea47cc4 usb: isp1760-hcd: Fix fall-through annotations)
> > Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove)
> > Merging usb-serial/usb-next (80ed53707bb3 USB: serial: drop unused iflag macro)
> > Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity)
> > Merging phy-next/next (708310711e6c dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy)
> > Merging tty/tty-next (45c054d0815b tty: serial: add driver for the SiFive UART)
> > Merging char-misc/char-misc-next (e21107aa6bf3 Merge tag 'soundwire-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next)
> > CONFLICT (content): Merge conflict in drivers/misc/Makefile
> > CONFLICT (content): Merge conflict in drivers/misc/Kconfig
> > Merging extcon/extcon-next (00053de52231 extcon: arizona: Disable mic detect if running when driver is removed)
> > Merging soundwire/next (1eea00d8e714 soundwire: cadence_master: remove spurious newline)
> > Merging thunderbolt/next (37209783c73a thunderbolt: Make priority unsigned in struct tb_path)
> > Merging staging/staging-next (0580db2cb6b3 staging: rtl8192u: ieee80211: Resolve ERROR reported by checkpatch)
> > CONFLICT (modify/delete): drivers/staging/mt7621-spi/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Makefile left in tree.
> > CONFLICT (modify/delete): drivers/staging/mt7621-spi/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Kconfig left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zr36060.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36060.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zr36060.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36060.c left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zr36057.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36057.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zr36050.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36050.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zr36050.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36050.c left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zr36016.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36016.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zr36016.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36016.c left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_procfs.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_procfs.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_procfs.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_procfs.c left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_driver.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_driver.c left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_device.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_device.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_device.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_device.c left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_card.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_card.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_card.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_card.c left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/zoran.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/videocodec.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/videocodec.h left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/videocodec.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/videocodec.c left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/zoran/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/Kconfig left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/mt9t031/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Makefile left in tree.
> > CONFLICT (modify/delete): drivers/staging/media/mt9t031/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Kconfig left in tree.
> > CONFLICT (content): Merge conflict in drivers/staging/erofs/unzip_vle.c
> > CONFLICT (content): Merge conflict in drivers/staging/erofs/data.c
> > CONFLICT (content): Merge conflict in drivers/spi/spi-mt7621.c
> > CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
> > CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
> > $ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_device.h drivers/staging/media/zoran/zoran_driver.c drivers/staging/media/zoran/zoran_procfs.c drivers/staging/media/zoran/zoran_procfs.h drivers/staging/media/zoran/zr36016.c drivers/staging/media/zoran/zr36016.h drivers/staging/media/zoran/zr36050.c drivers/staging/media/zoran/zr36050.h drivers/staging/media/zoran/zr360
 57.h drivers/staging/media/zoran/zr36060.c drivers/staging/media/zoran/zr36060.h
> > Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next)
> > Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)
> > Merging slave-dma/next (c6504be53972 dmaengine: stm32-dma: Fix unsigned variable compared with zero)
> > Merging cgroup/for-next (cd4f686eb6df Merge branch 'for-5.2' into for-next)
> > Merging scsi/for-next (aec67294b839 Merge branch 'misc' into for-next)
> > CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_els.c
> > CONFLICT (add/add): Merge conflict in drivers/phy/mediatek/phy-mtk-ufs.c
> > Merging scsi-mkp/for-next (9bee24d08c08 scsi: fdomain: Resurrect driver - PCI support)
> > 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 vhost/linux-next (4e76105b74c1 virtio: use dependent_ptr_mb)
> > CONFLICT (content): Merge conflict in drivers/pci/of.c
> > CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
> > Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
> > Merging gpio/for-next (93c6d8ca2807 Merge branch 'devel' into for-next)
> > Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>)
> > Merging pinctrl/for-next (b7cd97cd140f Merge branch 'devel' into for-next)
> > Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1)
> > Merging pwm/for-next (9ff06679e109 pwm: sysfs: fix typo "its" -> "it's")
> > Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT)
> > Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
> > Merging random/dev (b7d5dc21072c random: add a spinlock_t to struct batched_entropy)
> > Merging kselftest/next (d917fb876f6e selftests: build and run gpio when output directory is the src dir)
> > Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
> > Merging livepatching/for-next (7df6a9f68d5d Merge branch 'for-5.2-core' into for-next)
> > Merging coresight/next (b627167ed8e6 coresight: funnel: Support static funnel)
> > Merging rtc/rtc-next (87ccec4fd05d rtc: pcap: convert to SPDX identifier)
> > CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c
> > Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next)
> > CONFLICT (content): Merge conflict in fs/dax.c
> > Merging at24/at24/for-next (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016)
> > Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files)
> > Merging kspp/for-next/kspp (7f6563fc1e6b Merge branch 'for-linus/seccomp' into for-next/kspp)
> > Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
> > Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
> > Merging gnss/gnss-next (7cc10c5cb143 gnss: ubx: add u-blox,neo-6m compatible)
> > Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
> > Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
> > Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register)
> > Merging nvmem/for-next (889ba60c36ce nvmem: core: add NVMEM_SYSFS Kconfig)
> > Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility)
> > Merging hyperv/hyperv-next (a3fb7bf369ef drivers: input: serio: Add a module desription to the hyperv_keyboard driver)
> > Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable)
> > Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops)
> > Merging pidfd/for-next (eb364bbe6791 samples: show race-free pidfd metadata access)
> > CONFLICT (content): Merge conflict in samples/Makefile
> > Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work)
> > Merging akpm-current/current (b78fc46079e4 ipc-do-cyclic-id-allocation-for-the-ipc-object-fix)
> > CONFLICT (content): Merge conflict in mm/vmalloc.c
> > CONFLICT (content): Merge conflict in kernel/fork.c
> > CONFLICT (modify/delete): arch/s390/mm/gup.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/s390/mm/gup.c left in tree.
> > CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig.cputype
> > CONFLICT (content): Merge conflict in arch/powerpc/mm/mmu_context_iommu.c
> > CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
> > CONFLICT (content): Merge conflict in arch/parisc/mm/init.c
> > CONFLICT (content): Merge conflict in arch/nios2/Kconfig
> > CONFLICT (content): Merge conflict in arch/m68k/Kconfig
> > $ git rm -f arch/s390/mm/gup.c
> > $ git checkout -b akpm remotes/origin/akpm/master
> > Applying: pinctrl: fix pxa2xx.c build warnings
> > Applying: fs/coda/psdev.c: remove duplicate header
> > Applying: include/linux/sched/signal.h: replace `tsk' with `task'
> > Applying: fs/cachefiles/namei.c: remove duplicate header
> > Applying: fs/block_dev.c: Remove duplicate header
> > Applying: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h>
> > Applying: arch: remove <asm/sizes.h> and <asm-generic/sizes.h>
> > Applying: mm, memcg: rename ambiguously named memory.stat counters and functions
> > Applying: mm-rename-ambiguously-named-memorystat-counters-and-functions-fix
> > Applying: mm, memcg: consider subtrees in memory.events
> > Applying: drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl
> > Applying: drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl
> > Applying: mm: memcontrol: make cgroup stats and events query API explicitly local
> > Applying: mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix
> > Applying: mm: memcontrol: move stat/event counting functions out-of-line
> > Applying: mm: memcontrol: fix recursive statistics correctness & scalabilty
> > Applying: mm: memcontrol: fix NUMA round-robin reclaim at intermediate level
> > Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
> > Merging akpm/master (35eaa57007cd drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
> 
> Hi, I've noticed a build error if CONFIG_50I_ERRATUM_UNKNOWN1=y is enabled:
> 
> ../drivers/clocksource/arm_arch_timer.c:402:20: error: redefinition of
> ‘sun50i_a64_read_cntpct_el0’
>  static u64 notrace sun50i_a64_read_cntpct_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
> ../drivers/clocksource/arm_arch_timer.c:360:20: note: previous
> definition of ‘sun50i_a64_read_cntpct_el0’ was here
>  static u64 notrace sun50i_a64_read_cntpct_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
> ../drivers/clocksource/arm_arch_timer.c:407:20: error: redefinition of
> ‘sun50i_a64_read_cntvct_el0’
>  static u64 notrace sun50i_a64_read_cntvct_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
> ../drivers/clocksource/arm_arch_timer.c:365:20: note: previous
> definition of ‘sun50i_a64_read_cntvct_el0’ was here
>  static u64 notrace sun50i_a64_read_cntvct_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~
> ../drivers/clocksource/arm_arch_timer.c:412:20: error: redefinition of
> ‘sun50i_a64_read_cntp_tval_el0’
>  static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../drivers/clocksource/arm_arch_timer.c:370:20: note: previous
> definition of ‘sun50i_a64_read_cntp_tval_el0’ was here
>  static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../drivers/clocksource/arm_arch_timer.c:417:20: error: redefinition of
> ‘sun50i_a64_read_cntv_tval_el0’
>  static u32 notrace sun50i_a64_read_cntv_tval_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../drivers/clocksource/arm_arch_timer.c:375:20: note: previous
> definition of ‘sun50i_a64_read_cntv_tval_el0’ was here
>  static u32 notrace sun50i_a64_read_cntv_tval_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../drivers/clocksource/arm_arch_timer.c:375:20: warning:
> ‘sun50i_a64_read_cntv_tval_el0’ defined but not used
> [-Wunused-function]
> ../drivers/clocksource/arm_arch_timer.c:370:20: warning:
> ‘sun50i_a64_read_cntp_tval_el0’ defined but not used
> [-Wunused-function]
>  static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
>                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> make[3]: *** [../scripts/Makefile.build:279:
> drivers/clocksource/arm_arch_timer.o] Error 1
> make[3]: Target '__build' not remade because of errors.
> make[2]: *** [../scripts/Makefile.build:489: drivers/clocksource] Error 2
> 
> I think commit c950ca8c35ee ("clocksource/drivers/arch_timer:
> Workaround for Allwinner A64 timer instability") introduced the issue.
> 
> Cheers,
> Anders

It actually looks like it is the clocksource tree merge that causes it:

https://git.kernel.org/next/linux-next/c/5e70bc4029d33b14a6cee87707e7b402801ca310

Since that commit exists in two different trees.

Cheers,

Re: linux-next: Tree for May 2

[Anders Roxell]

On Thu, 2 May 2019 at 12:10, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Changes since 20190501:
>
> The kbuild tree gained a conflict against Linus' tree.
>
> The f2fs tree gained a build failure for which I applied a patch.
>
> The net-next tree gained a conflict against the net tree.
>
> The pidfd tree gained a conflict against the kbuild tree.
>
> The akpm-current tree gained a conflict against the parisc-hd tree.
>
> Non-merge commits (relative to Linus' tree): 10425
>  10206 files changed, 459072 insertions(+), 301989 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 298 trees (counting Linus' and 69 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 (65beea4c3a52 Merge tag 'arc-5.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc)
> Merging fixes/master (1995fa480636 kernel/compat.c: mark expected switch fall-throughs)
> Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs)
> Merging kbuild-current/fixes (79a3aaa7b82e Linux 5.1-rc3)
> Merging arc-current/for-curr (55c0c4c793b5 ARC: memset: fix build with L1_CACHE_SHIFT != 6)
> Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache)
> Merging arm64-fixes/for-next/fixes (4e69ecf4da1e arm64/module: ftrace: deal with place relative nature of PLTs)
> Merging m68k-current/for-linus (28713169d879 m68k: Add -ffreestanding to CFLAGS)
> Merging powerpc-fixes/fixes (7a3a4d763837 powerpc/mm_iommu: Allow pinning large regions)
> Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list)
> Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
> Merging net/master (886b7a50100a ipv6: A few fixes on dereferencing rt->from)
> Merging bpf/master (b9aa0b35d878 bpf, x32: Fix bug for BPF_ALU64 | BPF_NEG)
> Merging ipsec/master (837f74116585 xfrm: update doc about xfrm[46]_gc_thresh)
> Merging netfilter/master (33cc3c0cfa64 netfilter: nf_flow_table: check ttl value in flow offload data path)
> Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects)
> Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
> Merging mac80211/master (517879147493 mac80211: don't attempt to rename ERR_PTR() debugfs dirs)
> Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db)
> Merging sound-current/for-linus (3887c26c0e24 ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR)
> Merging sound-asoc-fixes/for-linus (952f0986cc51 Merge branch 'asoc-5.1' into asoc-linus)
> Merging regmap-fixes/for-linus (7fdc9fc87492 Merge branch 'regmap-5.1' into regmap-linus)
> Merging regulator-fixes/for-linus (222d7eef42eb Merge branch 'regulator-5.1' into regulator-linus)
> Merging spi-fixes/for-linus (9f2487a2ae45 Merge branch 'spi-5.1' into spi-linus)
> Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off))
> Merging driver-core.current/driver-core-linus (79a3aaa7b82e Linux 5.1-rc3)
> Merging tty.current/tty-linus (085b7755808a Linux 5.1-rc6)
> Merging usb.current/usb-linus (c114944d7d67 USB: w1 ds2490: Fix bug caused by improper use of altsetting array)
> Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write())
> Merging usb-serial-fixes/usb-linus (79a3aaa7b82e Linux 5.1-rc3)
> Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
> Merging phy/fixes (e6f32efb1b12 phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode)
> Merging staging.current/staging-linus (085b7755808a Linux 5.1-rc6)
> Merging char-misc.current/char-misc-linus (24f1bc280bce misc: rtsx: Fixed rts5260 power saving parameter and sd glitch)
> Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
> Merging thunderbolt-fixes/fixes (37624b58542f Linux 5.1-rc7)
> Merging input-current/for-linus (3a349763cf11 Input: synaptics-rmi4 - write config register values to the right offset)
> Merging crypto-current/master (b257b48cd583 crypto: lrw - Fix atomic sleep when walking skcipher)
> Merging ide/master (dc5c37736d16 drivers: ide: Kconfig: pedantic formatting)
> Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container)
> Merging kselftest-fixes/fixes (15ade5d2e777 Linux 5.1-rc4)
> Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
> Merging slave-dma-fixes/fixes (37624b58542f Linux 5.1-rc7)
> Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
> Merging mtd-fixes/mtd/fixes (9a8f612ca0d6 mtd: rawnand: marvell: Clean the controller state before each operation)
> Merging mfd-fixes/for-mfd-fixes (a05a2e7998ab mfd: sun6i-prcm: Allow to compile with COMPILE_TEST)
> Merging v4l-dvb-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
> Merging reset-fixes/reset/fixes (13e8a05b9224 reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev)
> Merging mips-fixes/mips-fixes (a1e8783db8e0 MIPS: perf: ath79: Fix perfcount IRQ assignment)
> Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak)
> Merging omap-fixes/fixes (6a38df676a0a ARM: dts: logicpd-som-lv: Fix MMC1 card detect)
> Merging kvm-fixes/master (e8ab8d24b488 KVM: nVMX: Fix size checks in vmx_set_nested_state)
> Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity)
> Merging hwmon-fixes/hwmon (b88c5049219a hwmon: (occ) Fix extended status bits)
> Merging nvdimm-fixes/libnvdimm-fixes (a7de824d947a Merge branch 'for-5.1/dax' into libnvdimm-for-next)
> Merging btrfs-fixes/next-fixes (38464fdaacb5 Merge branch 'misc-5.1' into next-fixes)
> Merging vfs-fixes/fixes (f69e749a4935 Abort file_remove_privs() for non-reg. files)
> Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry)
> Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry)
> Merging drivers-x86-fixes/fixes (57f634b76a95 platform/x86: dell-laptop: fix rfkill functionality)
> Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
> Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1)
> Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds)
> Merging scsi-fixes/fixes (144ec97493af scsi: aic7xxx: fix EISA support)
> Merging drm-fixes/drm-fixes (37624b58542f Linux 5.1-rc7)
> Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family)
> Merging drm-intel-fixes/for-linux-next-fixes (f5c58ba18ab8 drm/i915: Restore correct bxt_ddi_phy_calc_lane_lat_optim_mask() calculation)
> Merging mmc-fixes/fixes (dc4060a5dc25 Linux 5.1-rc5)
> Merging rtc-fixes/rtc-fixes (882c5e552ffd rtc: da9063: set uie_unsupported when relevant)
> Merging gnss-fixes/gnss-linus (79a3aaa7b82e Linux 5.1-rc3)
> Merging hyperv-fixes/hyperv-fixes (a0033bd1eae4 Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup())
> Merging drm-misc-fixes/for-linux-next-fixes (ab042b824c11 Revert "drm/qxl: drop prime import/export callbacks")
> Merging kbuild/for-next (f711b2ddcf08 Merge branch 'kconfig' into for-next)
> CONFLICT (content): Merge conflict in Makefile
> Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7)
> Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
> Merging dma-mapping/for-next (148a97d5a02a dma-mapping: remove an unnecessary NULL check)
> Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores)
> Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8)
> Merging arm/for-next (3d3c616177cc Merge branches 'fixes' and 'misc' into for-next)
> Merging arm64/for-next/core (a8f7ce5a9fbc Merge branch 'for-next/mmiowb' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core)
> CONFLICT (content): Merge conflict in arch/arm64/include/asm/futex.h
> Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling)
> Merging arm-soc/for-next (c19ddad91159 ARM: Document merges)
> Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
> Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
> Merging amlogic/for-next (14248aa919f9 Merge branch 'v5.2/drivers' into tmp/aml-rebuild)
> Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1)
> Merging at91/at91-next (ac650130c227 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
> CONFLICT (content): Merge conflict in arch/arm/mach-at91/pm.c
> Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next)
> Merging imx-mxs/for-next (7119403f9617 Merge branch 'imx/defconfig' into for-next)
> CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
> Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next)
> Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
> Merging mvebu/for-next (891f0f865c37 Merge branch 'mvebu/dt64' into mvebu/for-next)
> Merging omap/for-next (ef2989fe20d8 Merge branch 'fixes' into for-next)
> Merging reset/reset/next (d005aa750c9b reset: fix linux/reset.h errors)
> Merging qcom/for-next (1d31c0b1a28a Merge tag 'qcom-arm64-for-5.2-1' into really-done-for-5.2)
> Merging renesas/next (982700f80241 Merge branch 'arm-dt-for-v5.2' into next)
> Merging rockchip/for-next (9c539071723e Merge branch 'v5.2-clk/next' into for-next)
> Merging samsung/for-next (bebc6082da0a Linux 4.14)
> Merging samsung-krzk/for-next (831c75782772 Merge branch 'next/dt64' into for-next)
> Merging sunxi/sunxi/for-next (613c4ce8fddb Merge branch 'sunxi/dt-for-5.2' into sunxi/for-next)
> Merging tegra/for-next (b31c477a9892 Merge branch for-5.2/arm64/defconfig into for-next)
> Merging clk/clk-next (61d9707c08e7 Merge branch 'clk-imx' into clk-next)
> Merging clk-samsung/for-next (3c297d9e65d8 clk: samsung: exynos5410: Add gate clock for ADC)
> Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
> Merging csky/linux-next (a691f3334d58 csky/syscall_trace: Fixup return processing flow)
> Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
> Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
> Merging m68k/for-next (733df11cfc36 m68k: defconfig: Update defconfigs for v5.1-rc1)
> Merging m68knommu/for-next (37624b58542f Linux 5.1-rc7)
> Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
> Merging mips/mips-next (cf0c4876684d mips: Combine memblock init and memory reservation loops)
> Merging nds32/next (83f7b748f739 nds32: fix asm/syscall.h)
> Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE)
> Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
> Merging parisc-hd/for-next (2b731a920986 parisc: Update huge TLB page support to use per-pagetable spinlock)
> Merging powerpc/next (26ad26718dfa powerpc/mm: Fix section mismatch warning)
> Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
> Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
> Merging risc-v/for-next (fd7f744caed8 riscv: vdso: drop unnecessary cc-ldoption)
> Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
> Merging s390/features (7a5da02de8d6 locking/lockdep: check for freed initmem in static_obj())
> Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
> Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
> Merging uml/linux-next (aea05eb56e47 um: Fix for a possible OOPS in ubd initialization)
> Merging xtensa/xtensa-for-next (a26a70426e9b Merge branch 'xtensa-5.1-fixes' into xtensa-for-next)
> Merging fscrypt/master (2c58d548f570 fscrypt: cache decrypted symlink target in ->i_link)
> 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 (6033347bcdd8 Merge branch 'for-next-stale-20190425' into for-next-20190425)
> Merging ceph/master (37659182bff1 ceph: fix ci->i_head_snapc leak)
> Merging cifs/for-next (838a20335ea5 cifs: update module internal version number)
> Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
> Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file)
> Merging ext3/for_next (91e9f2c1d861 Merge quota fix from Chengguang.)
> Merging ext4/dev (7403c629f6c8 ext4: fix ext4_show_options for file systems w/o journal)
> Merging f2fs/dev (90a238561901 f2fs: add tracepoint for f2fs_filemap_fault())
> Applying: f2fs: fix up for "f2fs: add tracepoint for f2fs_filemap_fault()"
> Merging fuse/for-next (6407f44aaf2a fuse: Add ioctl flag for x32 compat ioctl)
> Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
> Merging nfs/linux-next (f2bc9c908dfe Merge tag 'fsnotify_for_v5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
> Merging nfs-anna/linux-next (b422df915cef lockd: Store the lockd client credential in struct nlm_host)
> Merging nfsd/nfsd-next (5926459e7c89 locks: move checks from locks_free_lock() to locks_release_private())
> Merging orangefs/for-next (7dccb4027ef9 orangefs: copy Orangefs-sized blocks into the pagecache if possible.)
> Merging overlayfs/overlayfs-next (993a0b2aec52 ovl: Do not lose security.capability xattr over metadata file copy-up)
> Merging ubifs/linux-next (5578e48e5c0b ubi: wl: Silence uninitialized variable warning)
> Merging v9fs/9p-next (bb06c388fa20 9p/net: fix memory leak in p9_client_create)
> Merging xfs/for-next (f00b8b784f75 Merge remote-tracking branch 'korg/iomap-5.2-merge' into for-next)
> Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check)
> Merging vfs/for-next (af467ef6c590 Merge branches 'work.misc' and 'work.dcache' into for-next)
> Merging printk/for-next (3ba3fee931aa Merge branch 'for-5.2-vsprintf-hardening' into for-next)
> CONFLICT (content): Merge conflict in mm/memblock.c
> CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h
> CONFLICT (content): Merge conflict in drivers/base/power/main.c
> Merging pci/next (e564375c4460 Merge branch 'pci/trivial')
> Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write)
> Merging hid/for-next (eb18d1215405 Merge branch 'for-5.2/logitech' into for-next)
> Merging i2c/i2c/for-next (5dc8e322f1a8 Merge branch 'i2c/for-current-fixed' into i2c/for-next)
> Merging i3c/i3c/next (124dbd750da4 i3c: master: dw: remove dead code from dw_i3c_master_*_xfers())
> Merging dmi/master (57361846b52b Linux 4.19-rc2)
> Merging hwmon-staging/hwmon-next (a60170000338 hwmon: (s3c) Use dev_get_drvdata())
> Merging jc_docs/docs-next (41f0a9542a25 docs/vm: Minor editorial changes in the THP and hugetlbfs)
> Merging v4l-dvb/master (7afa8db323e3 media: vsp1: Add support for missing 16-bit RGB555 formats)
> Merging v4l-dvb-next/master (9e98c678c2d6 Linux 5.1-rc1)
> Merging fbdev/fbdev-for-next (261ac4ddfa9f video: fbdev: atmel_lcdfb: remove set but not used variable 'pdata')
> Merging pm/linux-next (ff9cb8b1104e Merge branch 'pm-cpufreq' into linux-next)
> Merging cpufreq-arm/cpufreq/arm/linux-next (8db82563451f cpufreq: armada-37xx: fix frequency calculation for opp)
> Merging cpupower/cpupower (21027e78e7c1 cpupower: correct spelling of interval)
> Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt())
> Merging thermal/next (c5e7be3b089d Merge branches 'thermal-core' and 'thermal-intel' into next)
> Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5)
> Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
> Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces)
> Merging swiotlb/linux-next (8395c154abb7 swiotlb: dump used and total slots when swiotlb buffer is full (v2))
> Merging rdma/for-next (b9b0f34531e0 uverbs: Convert idr to XArray)
> Merging net-next/master (f76c4b571fee Merge branch 'net-mvpp2-cls-Add-classification')
> CONFLICT (content): Merge conflict in net/ipv6/route.c
> CONFLICT (content): Merge conflict in net/ipv4/xfrm4_policy.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
> CONFLICT (content): Merge conflict in .mailmap
> Merging bpf-next/master (2b5bc3c8ebce r8169: remove manual autoneg restart workaround)
> Merging ipsec-next/master (bb9cd077e216 xfrm: remove unneeded export_symbols)
> Applying: xfrm4: fix up for moved _decode_session4
> Merging mlx5-next/mlx5-next (91a40a48d52d net/mlx5: Fix broken hca cap offset)
> CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c
> Merging netfilter-next/master (1de6f3342191 netfilter: connlabels: fix spelling mistake "trackling" -> "tracking")
> Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
> Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols)
> Merging wireless-drivers-next/master (5a489b99ecbc Merge tag 'mt76-for-kvalo-2019-05-01' of https://github.com/nbd168/wireless)
> CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/fw/file.h
> Merging bluetooth/master (aa5658534f4f dt-bindings: net: bluetooth: Add device tree bindings for QTI chip WCN3998)
> Merging mac80211-next/master (88d6272acaaa net: phy: avoid unneeded MDIO reads in genphy_read_status)
> Merging gfs2/for-next (08b22006ad4e gfs2: Fix iomap write page reclaim deadlock)
> Merging mtd/mtd/next (9e98c678c2d6 Linux 5.1-rc1)
> Merging nand/nand/next (1c14fe2167ef mtd: nandsim: switch to exec_op interface)
> Merging spi-nor/spi-nor/next (dcb4b22eeaf4 spi-nor: s25fl512s supports region locking)
> Merging crypto/master (1036633e10f8 crypto: ecrdsa - select ASN1 and OID_REGISTRY for EC-RDSA)
> Merging drm/drm-next (060cebb20cdb drm: introduce a capability flag for syncobj timeline support)
> CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_drv.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_drv.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbdev.c
> Applying: drm/virtio: fix up bad merge of virtgpu_gem_prime_get_sg_table
> Merging amdgpu/drm-next (9cf211b86430 drm/amdkfd: Adjust weight to represent num_hops info when report xgmi iolink)
> Merging drm-intel/for-linux-next (9628e15ca9d5 drm/i915/icl: Whitelist GEN9_SLICE_COMMON_ECO_CHICKEN1)
> Merging drm-tegra/drm/tegra/for-next (61b51fb51c01 drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages())
> Merging drm-misc/for-linux-next (761e473f6b23 drm/gem: Fix sphinx warnings)
> Merging drm-msm/msm-next (b02872df58ac drm/msm/a6xx: Don't enable GPU state code if dependencies are missing)
> Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
> Merging mali-dp/for-upstream/mali-dp (ed94cfab195f drm/komeda: Use memset to initialize config_id)
> Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature)
> Merging etnaviv/etnaviv/next (fd2450a77d33 drm/etnaviv: clean up etnaviv_gem_new_handle)
> Merging kconfig/for-next (bebc6082da0a Linux 4.14)
> Merging regmap/for-next (615c4d9a50e2 Merge branch 'regmap-5.2' into regmap-next)
> Merging sound/for-next (f495222e2827 ALSA: hda - Register irq handler after the chip initialization)
> Merging sound-asoc/for-next (5b89c74d6724 Merge branch 'asoc-5.2' into asoc-next)
> CONFLICT (content): Merge conflict in MAINTAINERS
> Merging modules/modules-next (fde1bd9b0ceb kernel/module: Reschedule while waiting for modules to finish loading)
> Merging input/next (7b5bb55d0dad Input: add support for Azoteq IQS550/572/525)
> CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
> Merging block/for-next (33a213b75fd5 Merge branch 'for-5.2/block' into for-next)
> Merging device-mapper/for-next (940bc471780b dm mpath: always free attached_handler_name in parse_path())
> Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
> Merging mmc/next (7a8b9daf7ea6 mmc: omap_hsmmc: Use dev_get_drvdata())
> Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
> CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
> Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
> Merging mfd/for-mfd-next (7f042743306c mfd: cros_ec: Instantiate the CrOS USB PD logger driver)
> Merging backlight/for-backlight-next (a6d6a589cb09 video: lcd: Remove useless BACKLIGHT_CLASS_DEVICE dependencies)
> Merging battery/for-next (61e93655fc30 power: supply: core: Add missing documentation for CHARGE_CONTROL_* properties)
> Merging regulator/for-next (5d8a6506ef59 Merge branch 'regulator-5.2' into regulator-next)
> Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing)
> Merging apparmor/apparmor-next (058c4f342582 apparmor: fix spelling mistake "immutible" -> "immutable")
> Merging integrity/next-integrity (a2ffe5774e8e selftests/kexec: update get_secureboot_mode)
> Merging selinux/next (35a196bef449 proc: prevent changes to overridden credentials)
> CONFLICT (content): Merge conflict in scripts/selinux/mdp/mdp.c
> Merging tpmdd/next (ff89e2f4b34d tpm: Actually fail on TPM errors during "get random")
> Merging watchdog/master (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through)
> Merging iommu/next (398ece5bde7e Merge branches 'arm/tegra', 'arm/mediatek', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
> Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
> Merging vfio/next (41be3e261817 vfio: Fix WARNING "do not call blocking ops when !TASK_RUNNING")
> Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
> Merging audit/next (70c4cf17e445 audit: fix a memory leak bug)
> CONFLICT (content): Merge conflict in kernel/seccomp.c
> CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
> Merging devicetree/for-next (440868661f36 of: fix clang -Wunsequenced for be32_to_cpu())
> Merging mailbox/mailbox-for-next (17b860bbfc84 mailbox: imx: keep MU irq working during suspend/resume)
> Merging spi/for-next (2e5f081003f0 Merge branch 'spi-5.2' into spi-next)
> Merging tip/auto-latest (bc94903cc4a3 Merge branch 'core/core')
> CONFLICT (content): Merge conflict in mm/kasan/Makefile
> CONFLICT (content): Merge conflict in arch/x86/kernel/irq_64.c
> CONFLICT (content): Merge conflict in arch/s390/include/asm/Kbuild
> CONFLICT (content): Merge conflict in arch/arm64/include/asm/Kbuild
> Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210)
> Merging edac-amd/for-next (74676a8e247a arm64: dts: stratix10: Use new Stratix10 EDAC bindings)
> Merging irqchip/irq/irqchip-next (009669e74813 arm64: arch_k3: Enable interrupt controller drivers)
> Merging ftrace/for-next (070ea1a24f40 function_graph: Place ftrace_graph_entry_stub() prototype in include/linux/ftrace.h)
> Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits)
> Merging kvm/linux-next (3a1e5e4a2c7a Revert "KVM: doc: Document the life cycle of a VM and its resources")
> Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic)
> Merging kvm-ppc/kvm-ppc-next (0caecf5b0019 KVM: PPC: Book3S HV: XIVE: Clear escalation interrupt pointers on device close)
> CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
> Merging kvms390/next (b2d0371d2e37 KVM: s390: vsie: Return correct values for Invalid CRYCB format)
> Merging xen-tip/linux-next (72813bfbf027 xen/pvh: correctly setup the PV EFI interface for dom0)
> Merging percpu/for-next (cb453ce4846b Merge branch 'for-5.2' into for-next)
> Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu)
> Merging drivers-x86/for-next (98e2630284ab platform/x86: alienware-wmi: fix kfree on potentially uninitialized pointer)
> Merging chrome-platform/for-next (cdb80268a6b5 platform/chrome: wilco_ec: Add property helper library)
> Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings)
> Merging leds/for-next (05b8ccfba5d4 ALSA: line6: Avoid polluting led_* namespace)
> Merging ipmi/for-next (ed6c3a6d8996 ipmi: Remove warning if no slave address is present)
> Merging driver-core/driver-core-next (391c0325cc5f Revert "driver core: platform: Fix the usage of platform device name(pdev->name)")
> CONFLICT (content): Merge conflict in block/blk-sysfs.c
> Merging usb/usb-next (ce64cea47cc4 usb: isp1760-hcd: Fix fall-through annotations)
> Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove)
> Merging usb-serial/usb-next (80ed53707bb3 USB: serial: drop unused iflag macro)
> Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity)
> Merging phy-next/next (708310711e6c dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy)
> Merging tty/tty-next (45c054d0815b tty: serial: add driver for the SiFive UART)
> Merging char-misc/char-misc-next (e21107aa6bf3 Merge tag 'soundwire-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next)
> CONFLICT (content): Merge conflict in drivers/misc/Makefile
> CONFLICT (content): Merge conflict in drivers/misc/Kconfig
> Merging extcon/extcon-next (00053de52231 extcon: arizona: Disable mic detect if running when driver is removed)
> Merging soundwire/next (1eea00d8e714 soundwire: cadence_master: remove spurious newline)
> Merging thunderbolt/next (37209783c73a thunderbolt: Make priority unsigned in struct tb_path)
> Merging staging/staging-next (0580db2cb6b3 staging: rtl8192u: ieee80211: Resolve ERROR reported by checkpatch)
> CONFLICT (modify/delete): drivers/staging/mt7621-spi/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Makefile left in tree.
> CONFLICT (modify/delete): drivers/staging/mt7621-spi/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Kconfig left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zr36060.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36060.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zr36060.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36060.c left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zr36057.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36057.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zr36050.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36050.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zr36050.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36050.c left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zr36016.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36016.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zr36016.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36016.c left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_procfs.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_procfs.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_procfs.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_procfs.c left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_driver.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_driver.c left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_device.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_device.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_device.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_device.c left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_card.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_card.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_card.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_card.c left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/zoran.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/videocodec.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/videocodec.h left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/videocodec.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/videocodec.c left in tree.
> CONFLICT (modify/delete): drivers/staging/media/zoran/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/Kconfig left in tree.
> CONFLICT (modify/delete): drivers/staging/media/mt9t031/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Makefile left in tree.
> CONFLICT (modify/delete): drivers/staging/media/mt9t031/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Kconfig left in tree.
> CONFLICT (content): Merge conflict in drivers/staging/erofs/unzip_vle.c
> CONFLICT (content): Merge conflict in drivers/staging/erofs/data.c
> CONFLICT (content): Merge conflict in drivers/spi/spi-mt7621.c
> CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
> CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
> $ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_device.h drivers/staging/media/zoran/zoran_driver.c drivers/staging/media/zoran/zoran_procfs.c drivers/staging/media/zoran/zoran_procfs.h drivers/staging/media/zoran/zr36016.c drivers/staging/media/zoran/zr36016.h drivers/staging/media/zoran/zr36050.c drivers/staging/media/zoran/zr36050.h drivers/staging/media/zoran/zr36057.h drivers/staging/media/zoran/zr36060.c drivers/staging/media/zoran/zr36060.h
> Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next)
> Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)
> Merging slave-dma/next (c6504be53972 dmaengine: stm32-dma: Fix unsigned variable compared with zero)
> Merging cgroup/for-next (cd4f686eb6df Merge branch 'for-5.2' into for-next)
> Merging scsi/for-next (aec67294b839 Merge branch 'misc' into for-next)
> CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_els.c
> CONFLICT (add/add): Merge conflict in drivers/phy/mediatek/phy-mtk-ufs.c
> Merging scsi-mkp/for-next (9bee24d08c08 scsi: fdomain: Resurrect driver - PCI support)
> 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 vhost/linux-next (4e76105b74c1 virtio: use dependent_ptr_mb)
> CONFLICT (content): Merge conflict in drivers/pci/of.c
> CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
> Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
> Merging gpio/for-next (93c6d8ca2807 Merge branch 'devel' into for-next)
> Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>)
> Merging pinctrl/for-next (b7cd97cd140f Merge branch 'devel' into for-next)
> Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1)
> Merging pwm/for-next (9ff06679e109 pwm: sysfs: fix typo "its" -> "it's")
> Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT)
> Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
> Merging random/dev (b7d5dc21072c random: add a spinlock_t to struct batched_entropy)
> Merging kselftest/next (d917fb876f6e selftests: build and run gpio when output directory is the src dir)
> Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
> Merging livepatching/for-next (7df6a9f68d5d Merge branch 'for-5.2-core' into for-next)
> Merging coresight/next (b627167ed8e6 coresight: funnel: Support static funnel)
> Merging rtc/rtc-next (87ccec4fd05d rtc: pcap: convert to SPDX identifier)
> CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c
> Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next)
> CONFLICT (content): Merge conflict in fs/dax.c
> Merging at24/at24/for-next (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016)
> Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files)
> Merging kspp/for-next/kspp (7f6563fc1e6b Merge branch 'for-linus/seccomp' into for-next/kspp)
> Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
> Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
> Merging gnss/gnss-next (7cc10c5cb143 gnss: ubx: add u-blox,neo-6m compatible)
> Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
> Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
> Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register)
> Merging nvmem/for-next (889ba60c36ce nvmem: core: add NVMEM_SYSFS Kconfig)
> Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility)
> Merging hyperv/hyperv-next (a3fb7bf369ef drivers: input: serio: Add a module desription to the hyperv_keyboard driver)
> Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable)
> Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops)
> Merging pidfd/for-next (eb364bbe6791 samples: show race-free pidfd metadata access)
> CONFLICT (content): Merge conflict in samples/Makefile
> Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work)
> Merging akpm-current/current (b78fc46079e4 ipc-do-cyclic-id-allocation-for-the-ipc-object-fix)
> CONFLICT (content): Merge conflict in mm/vmalloc.c
> CONFLICT (content): Merge conflict in kernel/fork.c
> CONFLICT (modify/delete): arch/s390/mm/gup.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/s390/mm/gup.c left in tree.
> CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig.cputype
> CONFLICT (content): Merge conflict in arch/powerpc/mm/mmu_context_iommu.c
> CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
> CONFLICT (content): Merge conflict in arch/parisc/mm/init.c
> CONFLICT (content): Merge conflict in arch/nios2/Kconfig
> CONFLICT (content): Merge conflict in arch/m68k/Kconfig
> $ git rm -f arch/s390/mm/gup.c
> $ git checkout -b akpm remotes/origin/akpm/master
> Applying: pinctrl: fix pxa2xx.c build warnings
> Applying: fs/coda/psdev.c: remove duplicate header
> Applying: include/linux/sched/signal.h: replace `tsk' with `task'
> Applying: fs/cachefiles/namei.c: remove duplicate header
> Applying: fs/block_dev.c: Remove duplicate header
> Applying: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h>
> Applying: arch: remove <asm/sizes.h> and <asm-generic/sizes.h>
> Applying: mm, memcg: rename ambiguously named memory.stat counters and functions
> Applying: mm-rename-ambiguously-named-memorystat-counters-and-functions-fix
> Applying: mm, memcg: consider subtrees in memory.events
> Applying: drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl
> Applying: drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl
> Applying: mm: memcontrol: make cgroup stats and events query API explicitly local
> Applying: mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix
> Applying: mm: memcontrol: move stat/event counting functions out-of-line
> Applying: mm: memcontrol: fix recursive statistics correctness & scalabilty
> Applying: mm: memcontrol: fix NUMA round-robin reclaim at intermediate level
> Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
> Merging akpm/master (35eaa57007cd drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

Hi, I've noticed a build error if CONFIG_50I_ERRATUM_UNKNOWN1=y is enabled:

../drivers/clocksource/arm_arch_timer.c:402:20: error: redefinition of
‘sun50i_a64_read_cntpct_el0’
 static u64 notrace sun50i_a64_read_cntpct_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/clocksource/arm_arch_timer.c:360:20: note: previous
definition of ‘sun50i_a64_read_cntpct_el0’ was here
 static u64 notrace sun50i_a64_read_cntpct_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/clocksource/arm_arch_timer.c:407:20: error: redefinition of
‘sun50i_a64_read_cntvct_el0’
 static u64 notrace sun50i_a64_read_cntvct_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/clocksource/arm_arch_timer.c:365:20: note: previous
definition of ‘sun50i_a64_read_cntvct_el0’ was here
 static u64 notrace sun50i_a64_read_cntvct_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/clocksource/arm_arch_timer.c:412:20: error: redefinition of
‘sun50i_a64_read_cntp_tval_el0’
 static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/clocksource/arm_arch_timer.c:370:20: note: previous
definition of ‘sun50i_a64_read_cntp_tval_el0’ was here
 static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/clocksource/arm_arch_timer.c:417:20: error: redefinition of
‘sun50i_a64_read_cntv_tval_el0’
 static u32 notrace sun50i_a64_read_cntv_tval_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/clocksource/arm_arch_timer.c:375:20: note: previous
definition of ‘sun50i_a64_read_cntv_tval_el0’ was here
 static u32 notrace sun50i_a64_read_cntv_tval_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/clocksource/arm_arch_timer.c:375:20: warning:
‘sun50i_a64_read_cntv_tval_el0’ defined but not used
[-Wunused-function]
../drivers/clocksource/arm_arch_timer.c:370:20: warning:
‘sun50i_a64_read_cntp_tval_el0’ defined but not used
[-Wunused-function]
 static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[3]: *** [../scripts/Makefile.build:279:
drivers/clocksource/arm_arch_timer.o] Error 1
make[3]: Target '__build' not remade because of errors.
make[2]: *** [../scripts/Makefile.build:489: drivers/clocksource] Error 2

I think commit c950ca8c35ee ("clocksource/drivers/arch_timer:
Workaround for Allwinner A64 timer instability") introduced the issue.

Cheers,
Anders

linux-next: Tree for May 2

[Stephen Rothwell]

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

Hi all,

Changes since 20190501:

The kbuild tree gained a conflict against Linus' tree.

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

The net-next tree gained a conflict against the net tree.

The pidfd tree gained a conflict against the kbuild tree.

The akpm-current tree gained a conflict against the parisc-hd tree.

Non-merge commits (relative to Linus' tree): 10425
 10206 files changed, 459072 insertions(+), 301989 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 298 trees (counting Linus' and 69 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 (65beea4c3a52 Merge tag 'arc-5.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc)
Merging fixes/master (1995fa480636 kernel/compat.c: mark expected switch fall-throughs)
Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs)
Merging kbuild-current/fixes (79a3aaa7b82e Linux 5.1-rc3)
Merging arc-current/for-curr (55c0c4c793b5 ARC: memset: fix build with L1_CACHE_SHIFT != 6)
Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache)
Merging arm64-fixes/for-next/fixes (4e69ecf4da1e arm64/module: ftrace: deal with place relative nature of PLTs)
Merging m68k-current/for-linus (28713169d879 m68k: Add -ffreestanding to CFLAGS)
Merging powerpc-fixes/fixes (7a3a4d763837 powerpc/mm_iommu: Allow pinning large regions)
Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (886b7a50100a ipv6: A few fixes on dereferencing rt->from)
Merging bpf/master (b9aa0b35d878 bpf, x32: Fix bug for BPF_ALU64 | BPF_NEG)
Merging ipsec/master (837f74116585 xfrm: update doc about xfrm[46]_gc_thresh)
Merging netfilter/master (33cc3c0cfa64 netfilter: nf_flow_table: check ttl value in flow offload data path)
Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects)
Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging mac80211/master (517879147493 mac80211: don't attempt to rename ERR_PTR() debugfs dirs)
Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db)
Merging sound-current/for-linus (3887c26c0e24 ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR)
Merging sound-asoc-fixes/for-linus (952f0986cc51 Merge branch 'asoc-5.1' into asoc-linus)
Merging regmap-fixes/for-linus (7fdc9fc87492 Merge branch 'regmap-5.1' into regmap-linus)
Merging regulator-fixes/for-linus (222d7eef42eb Merge branch 'regulator-5.1' into regulator-linus)
Merging spi-fixes/for-linus (9f2487a2ae45 Merge branch 'spi-5.1' into spi-linus)
Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off))
Merging driver-core.current/driver-core-linus (79a3aaa7b82e Linux 5.1-rc3)
Merging tty.current/tty-linus (085b7755808a Linux 5.1-rc6)
Merging usb.current/usb-linus (c114944d7d67 USB: w1 ds2490: Fix bug caused by improper use of altsetting array)
Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write())
Merging usb-serial-fixes/usb-linus (79a3aaa7b82e Linux 5.1-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
Merging phy/fixes (e6f32efb1b12 phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode)
Merging staging.current/staging-linus (085b7755808a Linux 5.1-rc6)
Merging char-misc.current/char-misc-linus (24f1bc280bce misc: rtsx: Fixed rts5260 power saving parameter and sd glitch)
Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
Merging thunderbolt-fixes/fixes (37624b58542f Linux 5.1-rc7)
Merging input-current/for-linus (3a349763cf11 Input: synaptics-rmi4 - write config register values to the right offset)
Merging crypto-current/master (b257b48cd583 crypto: lrw - Fix atomic sleep when walking skcipher)
Merging ide/master (dc5c37736d16 drivers: ide: Kconfig: pedantic formatting)
Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container)
Merging kselftest-fixes/fixes (15ade5d2e777 Linux 5.1-rc4)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (37624b58542f Linux 5.1-rc7)
Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
Merging mtd-fixes/mtd/fixes (9a8f612ca0d6 mtd: rawnand: marvell: Clean the controller state before each operation)
Merging mfd-fixes/for-mfd-fixes (a05a2e7998ab mfd: sun6i-prcm: Allow to compile with COMPILE_TEST)
Merging v4l-dvb-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
Merging reset-fixes/reset/fixes (13e8a05b9224 reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev)
Merging mips-fixes/mips-fixes (a1e8783db8e0 MIPS: perf: ath79: Fix perfcount IRQ assignment)
Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak)
Merging omap-fixes/fixes (6a38df676a0a ARM: dts: logicpd-som-lv: Fix MMC1 card detect)
Merging kvm-fixes/master (e8ab8d24b488 KVM: nVMX: Fix size checks in vmx_set_nested_state)
Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity)
Merging hwmon-fixes/hwmon (b88c5049219a hwmon: (occ) Fix extended status bits)
Merging nvdimm-fixes/libnvdimm-fixes (a7de824d947a Merge branch 'for-5.1/dax' into libnvdimm-for-next)
Merging btrfs-fixes/next-fixes (38464fdaacb5 Merge branch 'misc-5.1' into next-fixes)
Merging vfs-fixes/fixes (f69e749a4935 Abort file_remove_privs() for non-reg. files)
Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry)
Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry)
Merging drivers-x86-fixes/fixes (57f634b76a95 platform/x86: dell-laptop: fix rfkill functionality)
Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1)
Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds)
Merging scsi-fixes/fixes (144ec97493af scsi: aic7xxx: fix EISA support)
Merging drm-fixes/drm-fixes (37624b58542f Linux 5.1-rc7)
Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family)
Merging drm-intel-fixes/for-linux-next-fixes (f5c58ba18ab8 drm/i915: Restore correct bxt_ddi_phy_calc_lane_lat_optim_mask() calculation)
Merging mmc-fixes/fixes (dc4060a5dc25 Linux 5.1-rc5)
Merging rtc-fixes/rtc-fixes (882c5e552ffd rtc: da9063: set uie_unsupported when relevant)
Merging gnss-fixes/gnss-linus (79a3aaa7b82e Linux 5.1-rc3)
Merging hyperv-fixes/hyperv-fixes (a0033bd1eae4 Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup())
Merging drm-misc-fixes/for-linux-next-fixes (ab042b824c11 Revert "drm/qxl: drop prime import/export callbacks")
Merging kbuild/for-next (f711b2ddcf08 Merge branch 'kconfig' into for-next)
CONFLICT (content): Merge conflict in Makefile
Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (148a97d5a02a dma-mapping: remove an unnecessary NULL check)
Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores)
Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8)
Merging arm/for-next (3d3c616177cc Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (a8f7ce5a9fbc Merge branch 'for-next/mmiowb' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/futex.h
Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling)
Merging arm-soc/for-next (c19ddad91159 ARM: Document merges)
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (14248aa919f9 Merge branch 'v5.2/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1)
Merging at91/at91-next (ac650130c227 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
CONFLICT (content): Merge conflict in arch/arm/mach-at91/pm.c
Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next)
Merging imx-mxs/for-next (7119403f9617 Merge branch 'imx/defconfig' into for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next)
Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next)
Merging mvebu/for-next (891f0f865c37 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (ef2989fe20d8 Merge branch 'fixes' into for-next)
Merging reset/reset/next (d005aa750c9b reset: fix linux/reset.h errors)
Merging qcom/for-next (1d31c0b1a28a Merge tag 'qcom-arm64-for-5.2-1' into really-done-for-5.2)
Merging renesas/next (982700f80241 Merge branch 'arm-dt-for-v5.2' into next)
Merging rockchip/for-next (9c539071723e Merge branch 'v5.2-clk/next' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (831c75782772 Merge branch 'next/dt64' into for-next)
Merging sunxi/sunxi/for-next (613c4ce8fddb Merge branch 'sunxi/dt-for-5.2' into sunxi/for-next)
Merging tegra/for-next (b31c477a9892 Merge branch for-5.2/arm64/defconfig into for-next)
Merging clk/clk-next (61d9707c08e7 Merge branch 'clk-imx' into clk-next)
Merging clk-samsung/for-next (3c297d9e65d8 clk: samsung: exynos5410: Add gate clock for ADC)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (a691f3334d58 csky/syscall_trace: Fixup return processing flow)
Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
Merging m68k/for-next (733df11cfc36 m68k: defconfig: Update defconfigs for v5.1-rc1)
Merging m68knommu/for-next (37624b58542f Linux 5.1-rc7)
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
Merging mips/mips-next (cf0c4876684d mips: Combine memblock init and memory reservation loops)
Merging nds32/next (83f7b748f739 nds32: fix asm/syscall.h)
Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE)
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
Merging parisc-hd/for-next (2b731a920986 parisc: Update huge TLB page support to use per-pagetable spinlock)
Merging powerpc/next (26ad26718dfa powerpc/mm: Fix section mismatch warning)
Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging risc-v/for-next (fd7f744caed8 riscv: vdso: drop unnecessary cc-ldoption)
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (7a5da02de8d6 locking/lockdep: check for freed initmem in static_obj())
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (aea05eb56e47 um: Fix for a possible OOPS in ubd initialization)
Merging xtensa/xtensa-for-next (a26a70426e9b Merge branch 'xtensa-5.1-fixes' into xtensa-for-next)
Merging fscrypt/master (2c58d548f570 fscrypt: cache decrypted symlink target in ->i_link)
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 (6033347bcdd8 Merge branch 'for-next-stale-20190425' into for-next-20190425)
Merging ceph/master (37659182bff1 ceph: fix ci->i_head_snapc leak)
Merging cifs/for-next (838a20335ea5 cifs: update module internal version number)
Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file)
Merging ext3/for_next (91e9f2c1d861 Merge quota fix from Chengguang.)
Merging ext4/dev (7403c629f6c8 ext4: fix ext4_show_options for file systems w/o journal)
Merging f2fs/dev (90a238561901 f2fs: add tracepoint for f2fs_filemap_fault())
Applying: f2fs: fix up for "f2fs: add tracepoint for f2fs_filemap_fault()"
Merging fuse/for-next (6407f44aaf2a fuse: Add ioctl flag for x32 compat ioctl)
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
Merging nfs/linux-next (f2bc9c908dfe Merge tag 'fsnotify_for_v5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging nfs-anna/linux-next (b422df915cef lockd: Store the lockd client credential in struct nlm_host)
Merging nfsd/nfsd-next (5926459e7c89 locks: move checks from locks_free_lock() to locks_release_private())
Merging orangefs/for-next (7dccb4027ef9 orangefs: copy Orangefs-sized blocks into the pagecache if possible.)
Merging overlayfs/overlayfs-next (993a0b2aec52 ovl: Do not lose security.capability xattr over metadata file copy-up)
Merging ubifs/linux-next (5578e48e5c0b ubi: wl: Silence uninitialized variable warning)
Merging v9fs/9p-next (bb06c388fa20 9p/net: fix memory leak in p9_client_create)
Merging xfs/for-next (f00b8b784f75 Merge remote-tracking branch 'korg/iomap-5.2-merge' into for-next)
Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check)
Merging vfs/for-next (af467ef6c590 Merge branches 'work.misc' and 'work.dcache' into for-next)
Merging printk/for-next (3ba3fee931aa Merge branch 'for-5.2-vsprintf-hardening' into for-next)
CONFLICT (content): Merge conflict in mm/memblock.c
CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h
CONFLICT (content): Merge conflict in drivers/base/power/main.c
Merging pci/next (e564375c4460 Merge branch 'pci/trivial')
Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write)
Merging hid/for-next (eb18d1215405 Merge branch 'for-5.2/logitech' into for-next)
Merging i2c/i2c/for-next (5dc8e322f1a8 Merge branch 'i2c/for-current-fixed' into i2c/for-next)
Merging i3c/i3c/next (124dbd750da4 i3c: master: dw: remove dead code from dw_i3c_master_*_xfers())
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (a60170000338 hwmon: (s3c) Use dev_get_drvdata())
Merging jc_docs/docs-next (41f0a9542a25 docs/vm: Minor editorial changes in the THP and hugetlbfs)
Merging v4l-dvb/master (7afa8db323e3 media: vsp1: Add support for missing 16-bit RGB555 formats)
Merging v4l-dvb-next/master (9e98c678c2d6 Linux 5.1-rc1)
Merging fbdev/fbdev-for-next (261ac4ddfa9f video: fbdev: atmel_lcdfb: remove set but not used variable 'pdata')
Merging pm/linux-next (ff9cb8b1104e Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (8db82563451f cpufreq: armada-37xx: fix frequency calculation for opp)
Merging cpupower/cpupower (21027e78e7c1 cpupower: correct spelling of interval)
Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt())
Merging thermal/next (c5e7be3b089d Merge branches 'thermal-core' and 'thermal-intel' into next)
Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5)
Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces)
Merging swiotlb/linux-next (8395c154abb7 swiotlb: dump used and total slots when swiotlb buffer is full (v2))
Merging rdma/for-next (b9b0f34531e0 uverbs: Convert idr to XArray)
Merging net-next/master (f76c4b571fee Merge branch 'net-mvpp2-cls-Add-classification')
CONFLICT (content): Merge conflict in net/ipv6/route.c
CONFLICT (content): Merge conflict in net/ipv4/xfrm4_policy.c
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
CONFLICT (content): Merge conflict in .mailmap
Merging bpf-next/master (2b5bc3c8ebce r8169: remove manual autoneg restart workaround)
Merging ipsec-next/master (bb9cd077e216 xfrm: remove unneeded export_symbols)
Applying: xfrm4: fix up for moved _decode_session4
Merging mlx5-next/mlx5-next (91a40a48d52d net/mlx5: Fix broken hca cap offset)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c
Merging netfilter-next/master (1de6f3342191 netfilter: connlabels: fix spelling mistake "trackling" -> "tracking")
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols)
Merging wireless-drivers-next/master (5a489b99ecbc Merge tag 'mt76-for-kvalo-2019-05-01' of https://github.com/nbd168/wireless)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/fw/file.h
Merging bluetooth/master (aa5658534f4f dt-bindings: net: bluetooth: Add device tree bindings for QTI chip WCN3998)
Merging mac80211-next/master (88d6272acaaa net: phy: avoid unneeded MDIO reads in genphy_read_status)
Merging gfs2/for-next (08b22006ad4e gfs2: Fix iomap write page reclaim deadlock)
Merging mtd/mtd/next (9e98c678c2d6 Linux 5.1-rc1)
Merging nand/nand/next (1c14fe2167ef mtd: nandsim: switch to exec_op interface)
Merging spi-nor/spi-nor/next (dcb4b22eeaf4 spi-nor: s25fl512s supports region locking)
Merging crypto/master (1036633e10f8 crypto: ecrdsa - select ASN1 and OID_REGISTRY for EC-RDSA)
Merging drm/drm-next (060cebb20cdb drm: introduce a capability flag for syncobj timeline support)
CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbdev.c
Applying: drm/virtio: fix up bad merge of virtgpu_gem_prime_get_sg_table
Merging amdgpu/drm-next (9cf211b86430 drm/amdkfd: Adjust weight to represent num_hops info when report xgmi iolink)
Merging drm-intel/for-linux-next (9628e15ca9d5 drm/i915/icl: Whitelist GEN9_SLICE_COMMON_ECO_CHICKEN1)
Merging drm-tegra/drm/tegra/for-next (61b51fb51c01 drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages())
Merging drm-misc/for-linux-next (761e473f6b23 drm/gem: Fix sphinx warnings)
Merging drm-msm/msm-next (b02872df58ac drm/msm/a6xx: Don't enable GPU state code if dependencies are missing)
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (ed94cfab195f drm/komeda: Use memset to initialize config_id)
Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature)
Merging etnaviv/etnaviv/next (fd2450a77d33 drm/etnaviv: clean up etnaviv_gem_new_handle)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (615c4d9a50e2 Merge branch 'regmap-5.2' into regmap-next)
Merging sound/for-next (f495222e2827 ALSA: hda - Register irq handler after the chip initialization)
Merging sound-asoc/for-next (5b89c74d6724 Merge branch 'asoc-5.2' into asoc-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging modules/modules-next (fde1bd9b0ceb kernel/module: Reschedule while waiting for modules to finish loading)
Merging input/next (7b5bb55d0dad Input: add support for Azoteq IQS550/572/525)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging block/for-next (33a213b75fd5 Merge branch 'for-5.2/block' into for-next)
Merging device-mapper/for-next (940bc471780b dm mpath: always free attached_handler_name in parse_path())
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (7a8b9daf7ea6 mmc: omap_hsmmc: Use dev_get_drvdata())
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (7f042743306c mfd: cros_ec: Instantiate the CrOS USB PD logger driver)
Merging backlight/for-backlight-next (a6d6a589cb09 video: lcd: Remove useless BACKLIGHT_CLASS_DEVICE dependencies)
Merging battery/for-next (61e93655fc30 power: supply: core: Add missing documentation for CHARGE_CONTROL_* properties)
Merging regulator/for-next (5d8a6506ef59 Merge branch 'regulator-5.2' into regulator-next)
Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing)
Merging apparmor/apparmor-next (058c4f342582 apparmor: fix spelling mistake "immutible" -> "immutable")
Merging integrity/next-integrity (a2ffe5774e8e selftests/kexec: update get_secureboot_mode)
Merging selinux/next (35a196bef449 proc: prevent changes to overridden credentials)
CONFLICT (content): Merge conflict in scripts/selinux/mdp/mdp.c
Merging tpmdd/next (ff89e2f4b34d tpm: Actually fail on TPM errors during "get random")
Merging watchdog/master (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through)
Merging iommu/next (398ece5bde7e Merge branches 'arm/tegra', 'arm/mediatek', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (41be3e261817 vfio: Fix WARNING "do not call blocking ops when !TASK_RUNNING")
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (70c4cf17e445 audit: fix a memory leak bug)
CONFLICT (content): Merge conflict in kernel/seccomp.c
CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
Merging devicetree/for-next (440868661f36 of: fix clang -Wunsequenced for be32_to_cpu())
Merging mailbox/mailbox-for-next (17b860bbfc84 mailbox: imx: keep MU irq working during suspend/resume)
Merging spi/for-next (2e5f081003f0 Merge branch 'spi-5.2' into spi-next)
Merging tip/auto-latest (bc94903cc4a3 Merge branch 'core/core')
CONFLICT (content): Merge conflict in mm/kasan/Makefile
CONFLICT (content): Merge conflict in arch/x86/kernel/irq_64.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/arm64/include/asm/Kbuild
Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210)
Merging edac-amd/for-next (74676a8e247a arm64: dts: stratix10: Use new Stratix10 EDAC bindings)
Merging irqchip/irq/irqchip-next (009669e74813 arm64: arch_k3: Enable interrupt controller drivers)
Merging ftrace/for-next (070ea1a24f40 function_graph: Place ftrace_graph_entry_stub() prototype in include/linux/ftrace.h)
Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits)
Merging kvm/linux-next (3a1e5e4a2c7a Revert "KVM: doc: Document the life cycle of a VM and its resources")
Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic)
Merging kvm-ppc/kvm-ppc-next (0caecf5b0019 KVM: PPC: Book3S HV: XIVE: Clear escalation interrupt pointers on device close)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Merging kvms390/next (b2d0371d2e37 KVM: s390: vsie: Return correct values for Invalid CRYCB format)
Merging xen-tip/linux-next (72813bfbf027 xen/pvh: correctly setup the PV EFI interface for dom0)
Merging percpu/for-next (cb453ce4846b Merge branch 'for-5.2' into for-next)
Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu)
Merging drivers-x86/for-next (98e2630284ab platform/x86: alienware-wmi: fix kfree on potentially uninitialized pointer)
Merging chrome-platform/for-next (cdb80268a6b5 platform/chrome: wilco_ec: Add property helper library)
Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings)
Merging leds/for-next (05b8ccfba5d4 ALSA: line6: Avoid polluting led_* namespace)
Merging ipmi/for-next (ed6c3a6d8996 ipmi: Remove warning if no slave address is present)
Merging driver-core/driver-core-next (391c0325cc5f Revert "driver core: platform: Fix the usage of platform device name(pdev->name)")
CONFLICT (content): Merge conflict in block/blk-sysfs.c
Merging usb/usb-next (ce64cea47cc4 usb: isp1760-hcd: Fix fall-through annotations)
Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove)
Merging usb-serial/usb-next (80ed53707bb3 USB: serial: drop unused iflag macro)
Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity)
Merging phy-next/next (708310711e6c dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy)
Merging tty/tty-next (45c054d0815b tty: serial: add driver for the SiFive UART)
Merging char-misc/char-misc-next (e21107aa6bf3 Merge tag 'soundwire-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next)
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/misc/Kconfig
Merging extcon/extcon-next (00053de52231 extcon: arizona: Disable mic detect if running when driver is removed)
Merging soundwire/next (1eea00d8e714 soundwire: cadence_master: remove spurious newline)
Merging thunderbolt/next (37209783c73a thunderbolt: Make priority unsigned in struct tb_path)
Merging staging/staging-next (0580db2cb6b3 staging: rtl8192u: ieee80211: Resolve ERROR reported by checkpatch)
CONFLICT (modify/delete): drivers/staging/mt7621-spi/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Makefile left in tree.
CONFLICT (modify/delete): drivers/staging/mt7621-spi/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Kconfig left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zr36060.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36060.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zr36060.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36060.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zr36057.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36057.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zr36050.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36050.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zr36050.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36050.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zr36016.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36016.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zr36016.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36016.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_procfs.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_procfs.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_procfs.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_procfs.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_driver.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_driver.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_device.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_device.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_device.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_device.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_card.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_card.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_card.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_card.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/zoran.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/videocodec.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/videocodec.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/videocodec.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/videocodec.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/zoran/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/Kconfig left in tree.
CONFLICT (modify/delete): drivers/staging/media/mt9t031/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Makefile left in tree.
CONFLICT (modify/delete): drivers/staging/media/mt9t031/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Kconfig left in tree.
CONFLICT (content): Merge conflict in drivers/staging/erofs/unzip_vle.c
CONFLICT (content): Merge conflict in drivers/staging/erofs/data.c
CONFLICT (content): Merge conflict in drivers/spi/spi-mt7621.c
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
$ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_device.h drivers/staging/media/zoran/zoran_driver.c drivers/staging/media/zoran/zoran_procfs.c drivers/staging/media/zoran/zoran_procfs.h drivers/staging/media/zoran/zr36016.c drivers/staging/media/zoran/zr36016.h drivers/staging/media/zoran/zr36050.c drivers/staging/media/zoran/zr36050.h drivers/staging/media/zoran/zr36057.h drivers/staging/media/zoran/zr36060.c drivers/staging/media/zoran/zr36060.h
Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE)
Merging slave-dma/next (c6504be53972 dmaengine: stm32-dma: Fix unsigned variable compared with zero)
Merging cgroup/for-next (cd4f686eb6df Merge branch 'for-5.2' into for-next)
Merging scsi/for-next (aec67294b839 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_els.c
CONFLICT (add/add): Merge conflict in drivers/phy/mediatek/phy-mtk-ufs.c
Merging scsi-mkp/for-next (9bee24d08c08 scsi: fdomain: Resurrect driver - PCI support)
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 vhost/linux-next (4e76105b74c1 virtio: use dependent_ptr_mb)
CONFLICT (content): Merge conflict in drivers/pci/of.c
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (93c6d8ca2807 Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>)
Merging pinctrl/for-next (b7cd97cd140f Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging pwm/for-next (9ff06679e109 pwm: sysfs: fix typo "its" -> "it's")
Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
Merging random/dev (b7d5dc21072c random: add a spinlock_t to struct batched_entropy)
Merging kselftest/next (d917fb876f6e selftests: build and run gpio when output directory is the src dir)
Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
Merging livepatching/for-next (7df6a9f68d5d Merge branch 'for-5.2-core' into for-next)
Merging coresight/next (b627167ed8e6 coresight: funnel: Support static funnel)
Merging rtc/rtc-next (87ccec4fd05d rtc: pcap: convert to SPDX identifier)
CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c
Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in fs/dax.c
Merging at24/at24/for-next (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016)
Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files)
Merging kspp/for-next/kspp (7f6563fc1e6b Merge branch 'for-linus/seccomp' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (7cc10c5cb143 gnss: ubx: add u-blox,neo-6m compatible)
Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register)
Merging nvmem/for-next (889ba60c36ce nvmem: core: add NVMEM_SYSFS Kconfig)
Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility)
Merging hyperv/hyperv-next (a3fb7bf369ef drivers: input: serio: Add a module desription to the hyperv_keyboard driver)
Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable)
Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops)
Merging pidfd/for-next (eb364bbe6791 samples: show race-free pidfd metadata access)
CONFLICT (content): Merge conflict in samples/Makefile
Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work)
Merging akpm-current/current (b78fc46079e4 ipc-do-cyclic-id-allocation-for-the-ipc-object-fix)
CONFLICT (content): Merge conflict in mm/vmalloc.c
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (modify/delete): arch/s390/mm/gup.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/s390/mm/gup.c left in tree.
CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig.cputype
CONFLICT (content): Merge conflict in arch/powerpc/mm/mmu_context_iommu.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c
CONFLICT (content): Merge conflict in arch/parisc/mm/init.c
CONFLICT (content): Merge conflict in arch/nios2/Kconfig
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
$ git rm -f arch/s390/mm/gup.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: fs/coda/psdev.c: remove duplicate header
Applying: include/linux/sched/signal.h: replace `tsk' with `task'
Applying: fs/cachefiles/namei.c: remove duplicate header
Applying: fs/block_dev.c: Remove duplicate header
Applying: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h>
Applying: arch: remove <asm/sizes.h> and <asm-generic/sizes.h>
Applying: mm, memcg: rename ambiguously named memory.stat counters and functions
Applying: mm-rename-ambiguously-named-memorystat-counters-and-functions-fix
Applying: mm, memcg: consider subtrees in memory.events
Applying: drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl
Applying: drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl
Applying: mm: memcontrol: make cgroup stats and events query API explicitly local
Applying: mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix
Applying: mm: memcontrol: move stat/event counting functions out-of-line
Applying: mm: memcontrol: fix recursive statistics correctness & scalabilty
Applying: mm: memcontrol: fix NUMA round-robin reclaim at intermediate level
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (35eaa57007cd drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

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

linux-next: Tree for May 2

[Stephen Rothwell]

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

Hi all,

Changes since 20180501:

Added tree: pcmcia
Removed tree: syscalls (finished with)

The net-next tree gained a conflict against the net tree.

The bpf-next tree gained a conflict against the bpf tree.

Non-merge commits (relative to Linus' tree): 3508
 3343 files changed, 134142 insertions(+), 61245 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 (f2125992e7cb Merge tag 'xfs-4.17-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-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 (6d08b06e67cd Linux 4.17-rc2)
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 (3789c122d0a0 arm64: avoid instrumenting atomic_ll_sc.o)
Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment)
Merging powerpc-fixes/fixes (b2d7ecbe3556 powerpc/kvm/booke: Fix altivec related build break)
Merging sparc/master (fff75eb2a08c Merge tag 'errseq-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (50a5852a657f nfp: flower: set tunnel ttl value to net default)
Merging bpf/master (a4e21ff8d9a3 bpf: minor fix to selftest test_stacktrace_build_id())
Merging ipsec/master (b4331a681822 vti6: Change minimum MTU to IPV4_MIN_MTU, vti6 can carry IPv4 too)
Merging netfilter/master (2f99aa31cd7a netfilter: nf_tables: skip synchronize_rcu if transaction log is empty)
Merging ipvs/master (765cca91b895 netfilter: conntrack: include kmemleak.h for kmemleak_not_leak())
Merging wireless-drivers/master (af8a41cccf8f rtlwifi: cleanup 8723be ant_sel definition)
Merging mac80211/master (2f0605a697f4 nl80211: Free connkeys on external authentication failure)
Merging rdma-fixes/for-rc (db82476f3741 IB/core: Make ib_mad_client_id atomic)
Merging sound-current/for-linus (76b3421b39bd ALSA: aloop: Add missing cable lock to ctl API callbacks)
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 (9aea9b6cc78d usb: musb: trace: fix NULL pointer dereference in musb_g_tx())
Merging usb-gadget-fixes/fixes (ed769520727e usb: gadget: composite Allow for larger configuration descriptors)
Merging usb-serial-fixes/usb-linus (470b5d6f0cf4 USB: serial: ftdi_sio: use jtag quirk for Arrow USB Blaster)
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 (6da6c0db5316 Linux v4.17-rc3)
Merging char-misc.current/char-misc-linus (6da6c0db5316 Linux v4.17-rc3)
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 NULL)
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 (a33554401e47 selftests: Fix lib.mk run_tests target shell script)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
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 (f017ca642e8a media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR)
Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20)
Merging mips-fixes/mips-fixes (b3d7e55c3f88 MIPS: uaccess: Add micromips clobbers to bzero invocation)
Merging kvm-fixes/master (5e62493f1a70 x86/headers/UAPI: Move DISABLE_EXITS KVM capability bits to the UAPI)
Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries)
Merging drm-intel-fixes/for-linux-next-fixes (6da6c0db5316 Linux v4.17-rc3)
Merging drm-misc-fixes/for-linux-next-fixes (f7aef1c20709 drm/vc4: Make sure vc4_bo_{inc,dec}_usecnt() calls are balanced)
Merging kbuild/for-next (6d08b06e67cd Linux 4.17-rc2)
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 (60695be2bb6b dma-mapping: postpone cpu addr translation on mmap)
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 (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 (c12d7e9fe9af ARM: defconfig: Update Gemini defconfig)
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 (8d7604c70869 Merge branch 'v4.18/defconfig' 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 (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging imx-mxs/for-next (7a3adfb6a804 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next)
Merging mvebu/for-next (736957008942 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (1e587dbb743b Merge branch 'omap-for-v4.18/dt' into for-next)
Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control)
Merging qcom/for-next (c9fe09a79371 soc: Unconditionally include qcom Makefile)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (5ce149e4a34e Merge branches 'arm64-dt-for-v4.18' and 'dt-for-v4.18' into next)
Merging rockchip/for-next (18effb31d2ab Merge branch 'v4.18-armsoc/dts32' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (9d0b5d37e912 Merge branch 'next/dt64' into for-next)
Merging sunxi/sunxi/for-next (62960b11f7d9 Merge branches 'sunxi/dt-for-4.18' and 'sunxi/h3-h5-for-4.18' into sunxi/for-next)
Merging tegra/for-next (4f17d3f55630 Merge branch for-4.18/memory into for-next)
Merging arm64/for-next/core (24534b351182 arm64: assembler: add macros to conditionally yield the NEON under PREEMPT)
Merging clk/clk-next (3add6f105161 Merge branch 'clk-fixes' into clk-next)
Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata)
Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse)
Merging m68k/for-next (f245ff73dbe9 m68k: Use read_persistent_clock64() consistently)
Merging m68knommu/for-next (a8ab0ed77140 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 (23f8adc497b7 MIPS: BCM47XX: Use __initdata for the bcm47xx_leds_pdata)
Merging nds32/next (99c7c4f57c4f nds32: Fix the allmodconfig build. To make sure CONFIG_CPU_LITTLE_ENDIAN is default y)
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 define)
Merging parisc-hd/for-next (c04d31f98cf5 parisc: Fix section mismatches)
Merging powerpc/next (60cc43fc8884 Linux 4.17-rc1)
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
Merging risc-v/for-next (6d08b06e67cd Linux 4.17-rc2)
Merging s390/features (598d76562cc2 s390/kexec_file: add declaration of purgatory related globals)
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 (bf9c7e3d7924 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 (a536b3a032a5 Merge branch 'for-next-next-v4.18-20180501' into for-next-20180501)
Merging ceph/master (9c55ad1c214d libceph: validate con->state at the top of try_write())
Merging cifs/for-next (41840cdbed77 smb3: fix redundant opens on root)
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 (7ef79ad52136 ext4: add MODULE_SOFTDEP to ensure crc32c is included in the initramfs)
Merging f2fs/dev (b549e322861b f2fs: check cap_resource only for data blocks)
Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation)
Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location)
Merging nfs/linux-next (60cc43fc8884 Linux 4.17-rc1)
Merging nfs-anna/linux-next (6da6c0db5316 Linux v4.17-rc3)
Merging nfsd/nfsd-next (36e000768550 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 (7b38460dc8e4 xfs: don't fail when converting shortform attr to long form during ATTR_REPLACE)
Merging file-locks/locks-next (7a107c0f55a3 fasync: Fix deadlock between task-context and interrupt-context kill_fasync())
Merging vfs/for-next (d944db1fd238 Merge branches 'work.dcache' and 'work.misc' 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 (276a20f7e4a6 Merge branch 'pci/virtualization')
Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression)
Merging hid/for-next (4936066ffbe9 Merge branch 'for-4.17/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f4df00a90ce6 Merge branch 'i2c/for-current' into i2c/for-next)
Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string)
Merging hwmon-staging/hwmon-next (20632ae1e914 hwmon: (k10temp) Display both Tctl and Tdie)
Merging jc_docs/docs-next (c9161088e54b docs/vm: ksm: split userspace interface to admin-guide/mm/ksm.rst)
Merging v4l-dvb/master (a2b2eff6ac27 media: v4l: fwnode: Fix comment incorrectly mentioning v4l2_fwnode_parse_endpoint)
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 (85d108dee574 video: omap: Improve a size determination in omapfb_do_probe())
Merging pm/linux-next (541d42f1e4ab Merge branch 'acpi-tools' into linux-next)
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 (16be45dad053 thermal: Use DEVICE_ATTR_{RO|RW|WO}() variants)
Merging thermal-soc/next (c8da6cdef57b thermal: exynos: Propagate error value from tmu_read())
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 (e12ee8ce5143 IB/rxe: remove unused function variable)
CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_resp.c
Merging net-next/master (702353b538f5 selftest: add test for TCP_INQ)
CONFLICT (content): Merge conflict in tools/testing/selftests/net/Makefile
CONFLICT (content): Merge conflict in include/net/ip6_route.h
Merging bpf-next/master (a3fe1f6f2ada tools: bpftool: change time format for program 'loaded at:' information)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/test_progs.c
Merging ipsec-next/master (154a8c46bad2 change the comment of vti6_ioctl)
CONFLICT (content): Merge conflict in net/ipv4/ip_output.c
Merging netfilter-next/master (8b2ebb6cf064 ipvs: initialize tbl->entries in ip_vs_lblc_init_svc())
Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support)
Merging ipvs-next/master (9a17740e0ea1 ipvs: fix multiplicative hashing in sh/dh/lblc/lblcr algorithms)
Merging wireless-drivers-next/master (f56324baf329 brcmfmac: coarse support for PCIe shared structure rev7)
Merging bluetooth/master (7f98779fd9b3 Bluetooth: Add a new 13d3:3496 QCA_ROME device)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
Merging mac80211-next/master (8db0c433692e regulatory: Rename confusing 'country IE' in log output)
Merging gfs2/for-next (9a38662ba4e2 gfs2: Remove sdp->sd_jheightsize)
Merging mtd/master (f6997bec6af4 mtd: rawnand: marvell: fix the chip-select DT parsing logic)
Merging l2-mtd/mtd/next (27ab41e2c183 mtd: nftl: Remove VLA usage)
Merging nand/nand/next (bb415dff3ab7 dt-bindings: mtd: mtk-nand: Update properties description)
Merging spi-nor/spi-nor/next (f134fbbb4ff8 mtd: spi-nor: clear Winbond Extended Address Reg on switch to 3-byte addressing.)
Merging crypto/master (658c9d2b9f37 crypto: crypto4xx - put temporary dst sg into request ctx)
Merging drm/drm-next (6d08b06e67cd Linux 4.17-rc2)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (c5ce3b8df6c7 drm/i915/execlists: Don't trigger preemption if complete)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_bios.c
Merging drm-tegra/drm/tegra/for-next (27e92f1f1600 drm/tegra: prime: Implement ->{begin,end}_cpu_access())
Merging drm-misc/for-linux-next (3131f209468d drm/vc4: Fix leak of the file_priv that stored the perfmon.)
Merging drm-msm/msm-next (789d4c300e10 drm/msm: don't deref error pointer in the msm_fbdev_create error path)
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 (4ed75c3e5255 drm/etnaviv: bump HW job limit to 4)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (76f721867da6 Merge branch 'regmap-4.18' into regmap-next)
Merging sound/for-next (dfd9944f7cf8 ALSA: cs46xx: fix spelling mistake: "amplifer" -> "amplifier")
Merging sound-asoc/for-next (1eda019bde09 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 (d91abc21e1e6 Input: alps - demystify trackstick initialization for v3 and v6 protocols)
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 (3d97c829edd4 dm: fix some sparse warnings and whitespace in dax methods)
Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers)
Merging mmc/next (5bec8e5878e2 mmc: mediatek: add 64G DRAM DMA support)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
Merging md/for-next (643369299cfe raid5: copy write hint from origin bio to stripe)
Merging mfd/for-mfd-next (ae0280fe1689 mfd: tps65911-comparator: Fix a build error)
Merging backlight/for-backlight-next (840d40d941bf MAINTAINERS: Add dri-devel for backlight subsystem patches)
Merging battery/for-next (1f140ff46708 Merge tag 'tags/tcpm-pps-4.18' into psy-next)
CONFLICT (content): Merge conflict in drivers/usb/core/hcd.c
Merging regulator/for-next (efeca25b1e99 Merge remote-tracking branch 'regulator/topic/ab8500' into regulator-next)
Merging security/next-testing (b3859ee18ed2 Merge tag 'v4.17-rc3' into next-general)
Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on buffer on error exit path)
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 (d141136f523a audit: normalize MAC_POLICY_LOAD record)
Merging tpmdd/next (33bfe29814bd tpm/st33zp24: Fix spelling mistake in macro ST33ZP24_TISREGISTER_UKNOWN)
Merging watchdog/master (6d08b06e67cd Linux 4.17-rc2)
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 (23bcc480dac2 audit: allow not equal op for audit by executable)
Merging devicetree/for-next (205188578726 Merge branches 'dt/linus' and 'dt/next' into for-next)
Merging mailbox/mailbox-for-next (dfbc9c5841fc mailbox: Remove depends on HAS_DMA in case of platform dependency)
Merging spi/for-next (1ac3cf3f825a Merge branch 'spi-4.18' into spi-next)
Merging tip/auto-latest (6ca67ff55bb3 Merge branch 'linus')
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 (0b3dec05dbbc tracing: Enforce passing in filter=NULL to create_filter())
Merging rcu/rcu/next (248d0f34b437 Merge branches 'exp.2018.04.20a', 'fixes.2018.04.23b', 'lock.2018.04.22a' and 'torture.2018.04.20a' into HEAD)
Merging kvm/linux-next (c18bb396d3d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
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 (eb0b4aa89cf2 x86/xen: Remove use of VLAs)
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 (6ed66c3ce095 platform/x86: Kconfig: Fix dell-laptop dependency chain.)
Merging chrome-platform/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t)
Merging leds/for-next (9e50d5fb0d18 leds: add LED driver for CR0014114 board)
Merging ipmi/for-next (1211229399b3 ipmi_ssif: Fix uninitialized variable issue)
Merging driver-core/driver-core-next (cd4846c5a68d Merge 4.17-rc3 into driver-core-next)
Merging usb/usb-next (252427037a36 typec: tcpm: Fix incorrect 'and' operator)
Merging usb-gadget/next (60cc43fc8884 Linux 4.17-rc1)
Merging usb-serial/usb-next (86c225c1b2e0 USB: serial: option: blacklist unused dwm-158 interfaces)
Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53)
Merging phy-next/next (cd3bf368aa7a phy: Add a driver for the ATH79 USB phy)
Merging tty/tty-next (7b6c81f46c5d Merge 4.17-rc3 into tty-next)
Merging char-misc/char-misc-next (720d690e3680 Merge 4.17-rc3 into char-misc-next)
Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1)
Merging staging/staging-next (03420865e10d Merge 4.17-rc3 into staging-next)
Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API)
Merging slave-dma/next (94dc4a7f6d02 Merge branch 'for-linus' into next)
Merging cgroup/for-next (c43c5ea75fd5 cgroup: Make cgroup_rstat_updated() ready for root cgroup usage)
Merging scsi/for-next (6980151fba2a Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (23b389c23139 scsi: mpt3sas: fix spelling mistake: "disbale" -> "disable")
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 (7e437d61514b ata: fix spelling mistake: "directon" -> "direction")
Merging vhost/linux-next (cfcde40e8ce3 ACPI: disable extra P_LVLx access on KVM)
Merging rpmsg/for-next (c8b62c8851ba Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (e74ceccb8dfb Merge branch 'devel' into for-next)
Merging pinctrl/for-next (cdda6f0eb841 Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (938a10bb4913 pinctrl: samsung: Document required order of banks)
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 menus)
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 (60cc43fc8884 Linux 4.17-rc1)
Merging y2038/y2038 (5dc0b1529d21 y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop)
Merging livepatching/for-next (3beed9bf1e3d Merge branch 'for-4.17/upstream-fixes' into for-next)
Merging coresight/next (d3ee4165467a coresight tmc etr: Removing extra newline)
Merging rtc/rtc-next (36d91a4d401c rtc: cmos: introduce quirks to enable use_acpi_alarm mode)
Merging nvdimm/libnvdimm-for-next (c5794510d7b5 MAINTAINERS: Add backup maintainers for libnvdimm and DAX)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
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)
Merging akpm-current/current (e8ff6013dc39 exofs-avoid-vla-in-structures-v2)
$ 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: 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 (1ffb084d79e4 sparc64: NG4 memset 32 bits overflow)

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

linux-next: Tree for May 2

[Stephen Rothwell]

Hi all,

Please do not add any v4.13 destined material in your linux-next
included branches until after v4.12-rc1 has been released.

Changes since 20170501:

The tip tree gained a build failure due to an interaction with Linus'
tree for which I applied a merge fix patch.

The drivers-x86 tree gained a conflict against the watchdog tree.

The nvdimm tree gained a conflict against the tip tree.

Non-merge commits (relative to Linus' tree): 11834
 10862 files changed, 1216693 insertions(+), 221066 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 and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) 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.

Below is a summary of the state of the merge.

I am currently merging 258 trees (counting Linus' and 37 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 (5fab10041b43 Merge tag 'devprop-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition)
Merging arc-current/for-curr (36b5a5152119 arc: axs10x: Fix ARC PGU default clock frequency)
Merging arm-current/fixes (6d8059493691 ARM: 8670/1: V7M: Do not corrupt vector table around v7m_invalidate_l1 call)
Merging m68k-current/for-linus (e3b1ebd67387 m68k: Wire up statx)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y)
Merging sparc/master (f83246089ca0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (0060e79a1f52 Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux)
Merging ipsec/master (cfcf99f987ba xfrm: fix GRO for !CONFIG_NETFILTER)
Merging netfilter/master (1519fccb3437 netfilter: update MAINTAINERS file)
Merging ipvs/master (c8d6c6b496dc ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface)
Merging mac80211/master (f83246089ca0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging sound-current/for-linus (d4a2fbcee0c8 Merge tag 'asoc-fix-v4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (b9c1153f7a9c PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam))
Merging driver-core.current/driver-core-linus (39da7c509acf Linux 4.11-rc6)
Merging tty.current/tty-linus (4f7d029b9bf0 Linux 4.11-rc7)
Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5)
Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held)
Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON)
Merging staging.current/staging-linus (39da7c509acf Linux 4.11-rc6)
Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging input-current/for-linus (7c5bb4ac2b76 Input: i8042 - add Clevo P650RS to the i8042 reset list)
Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information)
Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
Merging kselftest-fixes/fixes (c1ae3cfa0e89 Linux 4.11-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size)
Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats)
Merging drm-intel-fixes/for-linux-next-fixes (5a7ad1146caa Linux 4.11-rc8)
Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline)
Merging kbuild/for-next (5a692d46f61b Merge branches 'kbuild' and 'misc' into for-next)
CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild
CONFLICT (content): Merge conflict in include/linux/crypto.h
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (c92a90a5060a Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f00fa5f4163b arm64: pmuv3: use arm_pmu ACPI framework)
Merging arm-soc/for-next (47ee9017f4d1 Merge branches 'next/arm64', 'next/drivers', 'next/dt' and 'next/dt64' into for-next)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32746g-eval.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (715dcd206041 Merge branch 'v4.12/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (ce60fdaa7e9e Merge remote-tracking branch 'alex_korg/at91-dt' into at91-next)
Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (990df0480610 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (4495c08e8472 Linux 4.11-rc2)
Merging mvebu/for-next (4cfb1f480e35 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5a0bbcf7ab0f Merge branch 'omap-for-v4.12/defconfig' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12)
Merging renesas/next (c8906b237adf Merge branch 'fixes-for-v4.12' into next)
Merging rockchip/for-next (b1e842489772 Merge branch 'v4.12-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (f4fcaa6cec04 Merge branch 'next/dt64' into for-next)
Merging sunxi/sunxi/for-next (5675caea945d Merge branches 'sunxi/clk-for-4.12', 'sunxi/dt-for-4.12' and 'sunxi/fixes-for-4.11' into sunxi/for-next)
Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (2f9a0bec6597 arm64: Print DT machine model in setup_machine_fdt())
Merging clk/clk-next (0119dc6132d2 clk: x86: pmc-atom: Checking for IS_ERR() instead of NULL)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging m68knommu/for-next (99a2c395541f m68k/coldfire/pit: set ->min_delta_ticks and ->max_delta_ticks)
Merging metag/for-next (d3ba2e922d4d metag/usercopy: Add 64-bit get_user support)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (b153c82756e9 Merge branch '4.11-fixes' into mips-for-linux-next)
Merging nios2/for-next (d8f347ba35cf nios2: enable earlycon support)
Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (4f7d029b9bf0 Linux 4.11-rc7)
Merging powerpc/next (add2e1e58587 powerpc/mm/hash: Fix off-by-one in comment about kernel contexts ids)
Merging fsl/next (e21c7316d8dd soc/fsl/qbman: Disable IRQs for deferred QBMan work)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (d0790fb6e5bc Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into features)
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in arch/s390/include/uapi/asm/Kbuild
Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (382b06261081 MAINTAINERS: fscrypt: update mailing list, patchwork, and git)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (953a8bf6cedd Merge branch 'for-next-next-v4.12-20170425' into for-next-20170425)
Merging ceph/master (8179a101eb5f ceph: fix recursion between ceph_set_acl() and __ceph_setattr())
Merging cifs/for-next (a6f74e80f271 cifs: don't check for failure from mempool_alloc())
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (07f7e3135e58 Merge branch 'fsnotify' into for_next)
Merging ext4/dev (1efd3f764621 ext4: replace BUG_ON with WARN_ONCE in ext4_end_bio())
Merging f2fs/dev (fb8ace36ce12 f2fs: introduce CP_TRIMMED_FLAG to avoid unneeded discard)
CONFLICT (content): Merge conflict in fs/f2fs/inline.c
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (1f18b82c3437 pNFS: Ensure we commit the layout if it has been invalidated)
Merging nfsd/nfsd-next (ed6473ddc704 NFSv4: Fix callback server shutdown)
Merging orangefs/for-next (907bfcd8d8a6 orangefs: handle zero size write in debugfs)
Merging overlayfs/overlayfs-next (4a99f3c83dc4 ovl: do not set overlay.opaque on non-dir create)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (32fe905c17f0 ubifs: Fix O_TMPFILE corner case in ubifs_link())
Merging xfs/for-next (c4cf1acdb186 xfs: better log intent item refcount checking)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (ef3296e0e82f Merge branch 'for-linus' into for-next)
CONFLICT (content): Merge conflict in arch/sparc/Kconfig
CONFLICT (content): Merge conflict in arch/s390/Kconfig
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (cf39bf58afda printk: fix double printing with earlycon)
Merging pci/next (3146c8f4de9b Merge branch 'pci/remove' into next)
CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild
Merging pstore/for-next/pstore (3a7d2fd16c57 pstore: Solve lockdep warning by moving inode locks)
Merging hid/for-next (38c81b5434ac Merge branch 'for-4.11/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f49ee0593cde Merge branch 'i2c/for-4.12' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first)
Merging hwmon-staging/hwmon-next (6eaaea144dc5 hwmon: (pmbus) Add client driver for IR35221)
Merging jc_docs/docs-next (9bb0e9cb04c8 docs: Fix a couple typos)
Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails)
Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next)
Merging fbdev/fbdev-for-next (3bbb5b823416 video: console: Remove reference to CONFIG_8xx)
Merging pm/linux-next (a061321a7e70 Merge branches 'acpi-pmic', 'powercap' and 'pm-cpuidle' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (f7b553c688c3 Merge branches 'for-rc' and 'thermal-core' into next)
Merging thermal-soc/next (19fd1783c24e Merge branch 'work-linus' into work-next)
CONFLICT (content): Merge conflict in drivers/thermal/Makefile
CONFLICT (content): Merge conflict in drivers/thermal/Kconfig
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (48e75b430670 rhashtable: compact struct rhashtable_params)
CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild
CONFLICT (content): Merge conflict in include/linux/pci.h
CONFLICT (content): Merge conflict in drivers/pci/msi.c
Applying: nbd: fix up for nla_parse_nested() API change
Merging ipsec-next/master (e892d2d40445 esp: Fix misplaced spin_unlock_bh.)
Merging netfilter-next/master (a01aa920b8e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (47d272f0f988 Merge tag 'iwlwifi-next-for-kalle-2017-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging bluetooth/master (71653eb64bcc Bluetooth: Add selftest for ECDH key generation)
Merging mac80211-next/master (cec381919818 Merge tag 'mac80211-next-for-davem-2017-04-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next)
Merging rdma/for-next (87f0faadc685 IB/SA: Add OPA addr header)
Merging gfs2/for-next (d552a2b9b33e GFS2: Non-recursive delete)
Merging mtd/master (c1ae3cfa0e89 Linux 4.11-rc1)
Merging l2-mtd/master (4ca41cb2ae09 dt-bindings: mtd: Document the STM32 QSPI bindings)
Merging nand/nand/next (9d2ee0a60b8b mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program)
Merging spi-nor/next (dbef3e1e3c46 mtd: spi-nor: introduce Octo SPI protocols)
Merging crypto/master (929562b14478 crypto: stm32 - Fix OF module alias information)
Merging drm/drm-next (8b03d1ed2c43 Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_hdmi.c
Applying: tee: merge fix for dma-ops field name changes
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (88326ef05b26 drm/i915: Confirm the request is still active before adding it to the await)
Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/drm.c
Merging drm-misc/for-linux-next (f9b67f0014cb dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
Merging sunxi-drm/sunxi-drm/for-next (2da042ac05e9 MAINTAINERS: Add sun4i-drm git repo)
Merging imx-drm/imx-drm/next (3d1df96ad468 drm/imx: merge imx-drm-core and ipuv3-crtc in one module)
Merging etnaviv/etnaviv/next (78ec187f64fa drm/etnaviv: submit support for out-fences)
Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (0997e378be1d ALSA: ali5451: fix spelling mistake in "ali_capture_preapre")
Merging sound-asoc/for-next (20d5c84bef06 Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8978' and 'asoc/topic/zte-tdm' into asoc-next)
Merging modules/modules-next (175861882769 kallsyms: Use bounded strnchr() when parsing string)
Merging input/next (8a038b83e012 Input: ar1021_i2c - use BIT to check for a bit)
CONFLICT (content): Merge conflict in Documentation/input/ff.rst
Merging block/for-next (4d1ee100af58 Merge branch 'for-4.12/block' into for-next)
Applying: nbd: fix up for nla_parse_nested() API change
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (c52ae1eba966 dm: introduce a new DM_MAPIO_KILL return value)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (a627f025eb05 mmc: sdhci-of-esdhc: limit SD clock for ls1012a/ls1046a)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (b506335e5d2b md/raid10: skip spare disk as 'first' disk)
CONFLICT (content): Merge conflict in drivers/md/raid5.h
CONFLICT (content): Merge conflict in drivers/md/raid5.c
CONFLICT (content): Merge conflict in drivers/md/raid0.c
CONFLICT (content): Merge conflict in drivers/md/md.h
CONFLICT (content): Merge conflict in drivers/md/linear.c
Merging mfd/for-mfd-next (ab6241ae07c3 input: touchscreen: mxs-lradc: || vs && typos)
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
Merging battery/for-next (99484df028dd power: supply: bq27xxx: Add power_supply_battery_info support)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (f123e7b2a6e3 Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next)
Merging security/next (8979b02aaf1d tpm: Fix reference count to main device)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
Merging keys/keys-next (b5895237b035 KEYS: sanitize key structs before freeing)
Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug)
Merging tpmdd/next (8979b02aaf1d tpm: Fix reference count to main device)
Merging watchdog/master (0a7472cbf212 Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
Merging iommu/next (4c03b2929434 Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (4acdad9bab28 audit: use kmem_cache to manage the audit_buffer cache)
Merging devicetree/for-next (5d4dd65b1e98 of: fix unittest build without CONFIG_OF_OVERLAY)
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
Merging spi/for-next (282ec0ea65da Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next)
CONFLICT (content): Merge conflict in drivers/acpi/acpi_apd.c
Merging tip/auto-latest (f5caf73651eb Merge branch 'x86/vdso')
CONFLICT (content): Merge conflict in kernel/kprobes.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/efi-pstore.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/bug.h
CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188.dtsi
Applying: drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Applying: mm, zone_device: merge fix up for blk_mq_freeze_queue_start() rename
Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12)
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 (f8d5549df25e EDAC, ghes: Do not enable it by default)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (f96d18dee6f0 Merge branch 'trace/ftrace/core' into trace/ftrace/next)
Merging rcu/rcu/next (2ca573d94b18 rcu: Use timer as backstop for NOCB deferred wakeups)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Merging kvm/linux-next (bd17117bb2af Merge tag 'kvm-s390-next-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (1edb632133ef ARM: KVM: Fix idmap stub entry when running Thumb-2 code)
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic.h
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic-v2.c
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (fb7dcf723dd2 Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next)
Applying: powerpc: merge fix for powerpc_debugfs_root move.
Merging kvms390/next (e000b8e0968d s390: kvm: Cpu model support for msa6, msa7 and msa8)
Merging xen-tip/linux-next (acff05b64c57 xen/x86: Call xen_smp_intr_init_pv() on BSP)
CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c
CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
Applying: x86/xen: merge fix up for arch/x86/xen/mmu.c code movement
Applying: x86/xen: merge fix for arch/x86/xen/enlighten.c code movement
Merging percpu/for-next (8a1df543de8a percpu: remove unused chunk_alloc parameter from pcpu_get_pages())
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (6df97f85611c platform/x86: Make SILEAD_DMI depend on TOUCHSCREEN_SILEAD)
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
Merging leds/for-next (28c5fe99016d leds: pca9532: Extend pca9532 device tree support)
Merging ipmi/for-next (2c1175c2e8e5 ipmi/watchdog: fix wdog hang on panic waiting for ipmi response)
Merging driver-core/driver-core-next (523aa3586ffb Merge 4.11-rc6 into driver-core-next)
Merging usb/usb-next (c034a43e72dd staging: typec: Fairchild FUSB302 Type-c chip driver)
CONFLICT (content): Merge conflict in Documentation/media/v4l-drivers/philips.rst
Merging usb-gadget/next (48eab1f28d49 usb: gadget: udc: atmel: Update Kconfig help for fifo_mode = 0)
Merging usb-serial/usb-next (31c5d1922b90 USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit)
Merging usb-chipidea-next/ci-for-usb-next (a932a8041ff9 usb: chipidea: core: add sysfs group)
Merging phy-next/next (6239879b415e phy: qcom-qusb2: add NVMEM dependency)
Merging tty/tty-next (15a065485138 Merge 4.11-rc7 into tty-next)
CONFLICT (content): Merge conflict in include/linux/serdev.h
Merging char-misc/char-misc-next (2a76f89fa58c firmware: google memconsole: Fix return value check in platform_memconsole_init())
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c
Applying: firmware: google memconsole: merge fix for e820.h move
Merging extcon/extcon-next (70641a0a84e1 extcon: Use BIT() macro for the left-shift operation)
Merging staging/staging-next (11270059e8d0 staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd)
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_sir.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_sir.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_sasem.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_sasem.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/media/Makefile
CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
$ git rm -f drivers/staging/media/lirc/lirc_sasem.c drivers/staging/media/lirc/lirc_sir.c
Applying: staging: merge fix for add/change_virtual-intf API change
Applying: staging: merge fix for "nl80211: allow multiple active scheduled scan requests"
Applying: staging: rtl8723bs: fix up for cfg80211_roamed() API change
Merging mux/for-next (7816ffe4dcb6 mux: adg792a: add mux controller driver for ADG792A/G)
CONFLICT (content): Merge conflict in drivers/i2c/muxes/Makefile
CONFLICT (content): Merge conflict in drivers/i2c/muxes/Kconfig
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging slave-dma/next (64fe6098da04 Merge branch 'for-linus' into next)
Merging cgroup/for-next (0948307b3a5d Merge branch 'for-4.12' into for-next)
Merging scsi/for-next (e83d14310c40 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
CONFLICT (content): Merge conflict in drivers/scsi/osd/osd_uld.c
Applying: scsi: osd_uld: fix mismerge
Merging scsi-mkp/for-next (e7731da36f10 scsi: qla4xxx: fix spelling mistake: "Tempalate" -> "Template")
Merging target-updates/for-next (9f7ebfc64d2c tcm: make pi data verification configurable)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors)
Merging libata/for-next (6b0778cd8a78 Merge branch 'for-4.12' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (d635daaa99c6 ptr_ring: batched ring producer)
Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (da1376ff1f02 gpio: gpio-wcove: fix GPIO IRQ status mask)
CONFLICT (content): Merge conflict in drivers/input/misc/soc_button_array.c
Merging pinctrl/for-next (a5bf5fc060b0 pinctrl: artpec6: Remove .owner field for driver)
Merging pinctrl-samsung/for-next (c8dd100397f3 Merge branch 'pinctrl-next' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (d66bb1607e2d proc: Fix unbalanced hard link numbers)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (83896c68fd32 selftests: create cpufreq kconfig fragments)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (608822c0f7af Merge branch 'for-4.12/upstream' into for-next)
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in include/linux/init_task.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/s390/kernel/entry.S
CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
Merging coresight/next (8b3fa19142e8 coresight: tmc: minor fix for output log)
Merging rtc/rtc-next (5d05e81516cf rtc: sh: mark PM functions as unused)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (e6aaac00a6f6 Merge branch 'for-4.12/dax' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c
CONFLICT (content): Merge conflict in drivers/block/brd.c
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging akpm-current/current (5aca360fdf57 sysv,ipc: cacheline align kern_ipc_perm)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/run_vmtests
$ git checkout -b akpm remotes/origin/akpm/master
Applying: imx7: fix Kconfig warning and build errors
Applying: sparc64: NG4 memset 32 bits overflow
Applying: mm: zero hash tables in allocator
Applying: mm: update callers to use HASH_ZERO flag
Applying: mm: adaptive hash table scaling
Applying: mm: introduce kv[mz]alloc helpers
Applying: mm: introduce kv[mz]alloc helpers - f2fs fix up
Applying: mm: support __GFP_REPEAT in kvmalloc_node for >32kB
Applying: lib/rhashtable.c: simplify a strange allocation pattern
Applying: net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern
Applying: fs/xattr.c: zero out memory copied to userspace in getxattr
Applying: treewide: use kv[mz]alloc* rather than opencoded variants
Applying: net: use kvmalloc with __GFP_REPEAT rather than open coded variant
Applying: drivers/md/dm-ioctl.c: use kvmalloc rather than opencoded variant
Applying: drivers/md/bcache/super.c: use kvmalloc
Applying: mm, swap: use kvzalloc to allocate some swap data structures
Applying: mm, vmalloc: use __GFP_HIGHMEM implicitly
Applying: scripts/spelling.txt: add "memory" pattern and fix typos
Applying: scripts/spelling.txt: Add regsiter -> register spelling mistake
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: treewide: spelling: correct diffrent[iate] and banlance typos
Applying: treewide: move set_memory_* functions away from cacheflush.h
Applying: arm: use set_memory.h header
Applying: arm64: use set_memory.h header
Applying: s390: use set_memory.h header
Applying: x86: use set_memory.h header
Applying: agp: use set_memory.h header
Applying: drm: use set_memory.h header
Applying: drm-use-set_memoryh-header-fix
Applying: drivers/hwtracing/intel_th/msu.c: use set_memory.h header
Applying: drivers/watchdog/hpwdt.c: use set_memory.h header
Applying: include/linux/filter.h: use set_memory.h header
Applying: kernel/module.c: use set_memory.h header
Applying: kernel/power/snapshot.c: use set_memory.h header
Applying: alsa: use set_memory.h header
Applying: drivers/misc/sram-exec.c: use set_memory.h header
Applying: drivers/video/fbdev/vermilion/vermilion.c: use set_memory.h header
Applying: drivers/staging/media/atomisp/pci/atomisp2: use set_memory.h
Applying: treewide: decouple cacheflush.h and set_memory.h
Applying: kprobes/x86: merge fix for set_memory.h decoupling
Applying: kref: remove WARN_ON for NULL release functions
Applying: drivers/scsi/megaraid: remove expensive inline from megasas_return_cmd
Applying: include/linux/uaccess.h: remove expensive WARN_ON in pagefault_disabled_dec
Applying: fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag
Applying: Documentation/vm/transhuge.txt: fix trivial typos
Applying: docs-vm-transhuge-fix-few-trivial-typos-fix
Applying: format-security: move static strings to const
Applying: fs: f2fs: use ktime_get_real_seconds for sit_info times
Applying: trace: make trace_hwlat timestamp y2038 safe
Applying: fs: cifs: replace CURRENT_TIME by other appropriate apis
Applying: fs: ceph: CURRENT_TIME with ktime_get_real_ts()
Applying: fs: ufs: use ktime_get_real_ts64() for birthtime
Applying: fs: ubifs: replace CURRENT_TIME_SEC with current_time
Applying: lustre: replace CURRENT_TIME macro
Applying: apparmorfs: replace CURRENT_TIME with current_time()
Applying: gfs2: replace CURRENT_TIME with current_time
Applying: time: delete CURRENT_TIME_SEC and CURRENT_TIME
Applying: time: delete current_fs_time()
Applying: mm/huge_memory.c.c: use zap_deposited_table() more
Applying: mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required
Applying: mm: prevent potential recursive reclaim due to clearing PF_MEMALLOC
Applying: mm: introduce memalloc_noreclaim_{save,restore}
Applying: treewide: convert PF_MEMALLOC manipulations to new helpers
Applying: treewide-convert-pf_memalloc-manipulations-to-new-helpers-fix
Applying: mtd: nand: nandsim: convert to memalloc_noreclaim_*()
Applying: dax: add tracepoints to dax_iomap_pte_fault()
Applying: dax: add tracepoints to dax_pfn_mkwrite()
Applying: dax: add tracepoints to dax_load_hole()
Applying: dax: add tracepoints to dax_writeback_mapping_range()
Applying: dax: fix regression in dax_writeback_mapping_range()
Applying: dax: add tracepoint to dax_writeback_one()
Applying: dax-add-tracepoint-to-dax_writeback_one-fix
Applying: dax: add tracepoint to dax_insert_mapping()
Applying: selftests/vm: add a test for virtual address range mapping
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (0727eed336a5 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)

linux-next: Tree for May 2

[Stephen Rothwell]

Hi all,

Changes since 20160429:

The powerpc tree gained a conflict against Linus' tree.

The vfs tree gained conflicts against Linus'and the overlayfs trees and
a build failure for which I applied a merge fix patch.

The tpmdd tree still had its build failure for which I added a fix patch.

The rcu tree gained a build failure for which I reverted a commit.

The xen-tip tree gained a conflict against the tip tree.

The driver-core tree gained a build failure for which I reverted a commit.

The tty tree gained a conflict against the mips tree.

The akpm-current tree gained a conflict against the powerpc tree and a
build failure for which I applied a merge fix patch.

Non-merge commits (relative to Linus' tree): 7479
 6698 files changed, 279887 insertions(+), 139672 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 and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.

Below is a summary of the state of the merge.

I am currently merging 234 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).

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 (da9373d67c8a Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (1b10cb21d888 ARC: add support for reserved memory defined by device tree)
Merging arm-current/fixes (ac36a881b72a ARM: 8564/1: fix cpu feature extracting helper)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (d701cca6744f powerpc: wire up preadv2 and pwritev2 syscalls)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (49fa5230462f sparc64: Fix bootup regressions on some Kconfig combinations.)
Merging net/master (f27337e16f2d ip_tunnel: fix preempt warning in ip tunnel creation/updating)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (bcf493428840 netfilter: ebtables: Fix extension lookup with identical name)
Merging wireless-drivers/master (e2841ea91611 Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (2d2c038a9999 ALSA: usb-audio: Quirk for yet another Phoenix Audio devices (v2))
Merging pci-current/for-linus (67e658794ca1 cxgb4: Set VPD size so we can read both VPD structures)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (02da2d72174c Linux 4.6-rc5)
Merging usb.current/usb-linus (550af790882f Merge tag 'usb-serial-4.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (613ac23a46e1 USB: serial: cp210x: add Straizona Focusers device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (431adc0aeca6 Merge tag 'iio-fixes-for-4.6c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (1db488d12894 Drivers: hv: vmbus: Fix signaling logic in hv_need_to_signal_on_read())
Merging input-current/for-linus (eb43335c4095 Input: atmel_mxt_ts - use mxt_acquire_irq in mxt_soft_reset)
Merging crypto-current/master (9e209fcfb804 crypto: qat - fix invalid pf2vf_resp_wq logic)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (4ea3959018d0 drm/i915: Make RPS EI/thresholds multiple of 25 on SNB-BDW)
Merging asm-generic/master (987aedb5d6f6 generic syscalls: wire up preadv2 and pwritev2 syscalls)
Merging arc/for-next (767cb9d8abfa ARC: Add eznps platform to Kconfig and Makefile)
Merging arm/for-next (c6433ebdc184 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (bf7d0eb9d294 Merge branch 'fixes' into for-next)
Merging at91/at91-next (087fb002b466 Merge branch 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (ca2c44b4980c Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c62bda50efd Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (100b83d52f51 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (48f2a282081f Merge branch 'v4.7-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (be28390fe8f5 Merge branch 'fixes' into for-next)
Merging sunxi/sunxi/for-next (f1e9b6675c26 Merge branches 'sunxi/clocks-for-4.7', 'sunxi/dt-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (6f26b3671184 arm64: kaslr: increase randomization granularity)
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (02da2d72174c Linux 4.6-rc5)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (7620fecf8342 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (a8950e49bd24 nios2: memset: use the right constraint modifier for the %4 output operand)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (c3c900cf192e powerpc/mm/radix: Document software bits for radix)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (7072276e6c0e s390/Kconfig: make z196 the default processor type)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (4ef00aa30a3f tile: sort the "select" lines in the TILE/TILEGX configs)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (39cbac2436dc Merge branch 'for-next-current-4.7-20160429' into for-next-20160429)
Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog)
Merging cifs/for-next (2b6c3239da3f cifs: remove any preceding delimiter from prefix_path)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (2a28900be206 udf: Export superblock magic to userspace)
Merging ext4/dev (8f4c50d70cc1 ext4: remove trailing \n from ext4_warning/ext4_error calls)
Merging f2fs/dev (aca9958e97b7 ext4 crypto: migrate into vfs's crypto engine)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (2c932d4c9165 fuse: Fix return value from fuse_get_user_pages())
Merging gfs2/for-next (9c7fe83530a3 GFS2: Add calls to gfs2_holder_uninit in two error handlers)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (04974df8049f Linux 4.6-rc6)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
CONFLICT (content): Merge conflict in fs/ext4/file.c
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (7d2dbb9faf05 fixups for PAGE_CACHE_SIZE/page_cache_release-induced conflicts)
CONFLICT (content): Merge conflict in fs/overlayfs/super.c
CONFLICT (content): Merge conflict in fs/nfs/dir.c
CONFLICT (content): Merge conflict in fs/ecryptfs/mmap.c
CONFLICT (content): Merge conflict in fs/cifs/file.c
Applying: gfs2: fix up for i_mutex -> i_rwsem change
Merging pci/next (a84e2b702bd6 Merge branches 'pci/host-armada', 'pci/host-designware' and 'pci/host-keystone' into next)
Applying: iommu/amd: fix up for aliases API change
Merging hid/for-next (a299086f23d1 Merge branch 'for-4.7/upstream' into for-next)
Merging i2c/i2c/for-next (b3b859225348 Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (71a9c23246fe hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (dcb7c0b9e2ad Merge branch 'patchwork' into to_next)
Merging libata/for-next (c5cf484d03f1 Merge branch 'for-4.6-fixes' into for-next)
Merging pm/linux-next (4bbb40bd0dce Merge branch 'pm-tools' into linux-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
CONFLICT (content): Merge conflict in MAINTAINERS
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (6ebe83cb5b65 Merge branch 'topic/pxa' into next)
Merging net-next/master (70e927b98bb6 mdio_bus: Fix MDIO bus scanning in __mdiobus_register())
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (8fb04d9fc70a ipvs: don't alter conntrack in OPS mode)
Merging wireless-drivers-next/master (9d3f65b0c2dd mwifiex: increase dwell time for active scan)
Merging bluetooth/master (50d5d2bd1d42 Merge branch 'sh_eth-next')
Merging mac80211-next/master (d686b920abb7 nl80211: use nla_put_u64_64bit() for the remaining u64 attributes)
Merging rdma/for-next (ccea5f0f0179 RDMA/i40iw: Fix for removing quad hash entries)
Merging rdma-leon/rdma-next (c3b46c73264b Linux 4.6-rc4)
Merging rdma-leon-test/testing/rdma-next (c3b46c73264b Linux 4.6-rc4)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (abbbc60a0c69 mtd: pmc551: add __init attribute)
Merging nand/nand/next (4ab41e74ae5d mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (d1497977fecb crypto: s5p-sss - fix incorrect usage of scatterlists api)
Merging drm/drm-next (b89359bdf0f1 Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next)
Applying: drm/i915: fix up for edp_low_vswing change
Merging drm-panel/drm/panel/for-next (1ac3bac7c733 drm/panel: simple: Add support for Innolux AT070TN92)
Merging drm-intel/for-linux-next (5b4fd5b1111b drm/i915: Update DRIVER_DATE to 20160425)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (be35f94f5c83 drm/atomic: Add missing drm_crtc_internal.h include)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (5b0e84c5bef6 drm/msm/mdp4: Don't manage DSI PLL regulators in MDP driver)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (5883980313af drm/vc4: Fix NULL deref in HDMI init error path)
Merging kbuild/for-next (7eb09bb55394 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (8eabbbb9c0c9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (57dd5414a087 ALSA: usb-audio: Limit retrying sample rate reads)
Merging sound-asoc/for-next (8df52741e0de Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (5ad629a82de3 Input: byd - don't wipe dynamically allocated memory twice)
Merging block/for-next (783f8d0af678 Merge branch 'for-4.7/drivers' into for-next)
Merging device-mapper/for-next (ecdb57d205b9 dm raid: make sure no feature flags are set in metadata)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (b941a0e9598e mmc: sdhci-of-arasan: fix set_clock when a phy is supported)
Merging md/for-next (b8a0b8e94648 raid5: delete unnecessary warnning)
Merging mfd/for-mfd-next (ba5776ab6f09 mfd: cros_ec: Allow building for ARM64)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (670786c76180 Merge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next)
Merging security/next (da20dfe6b50e fs: fix over-zealous use of "const")
Merging integrity/next (8eb27209596a ima: fix func_ enumeration ordering)
Merging keys/keys-next (1ea6102bba5f Merge branch 'keys-trust' into keys-next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging selinux/next (c2316dbf1242 selinux: apply execstack check on thread stacks)
Merging tpmdd/next (54745cb48339 tpm: select ANON_INODES for proxy driver)
Applying: tpm: fix for typo in tpm/tpm_ibmvtpm.c
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (1229bc9a9973 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (5ed4aba1265f vfio_iommu_spapr_tce: Remove unneeded iommu_group_get_iommudata)
Merging jc_docs/docs-next (2fd872bd84b3 Doc: correct the location of sysrq.c)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (1c986e3643d2 of: document refcount incrementation of of_get_cpu_node())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
Merging mailbox/mailbox-for-next (dd28216528cf mailbox/omap: kill omap_mbox_{save/restore}_ctx() functions)
Merging spi/for-next (a2028e27ddcf Merge remote-tracking branches 'spi/topic/pic32-qspi', 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (432bc85d1419 Merge branch 'WIP.futex')
CONFLICT (content): Merge conflict in drivers/firmware/efi/arm-init.c
CONFLICT (content): Merge conflict in drivers/cpufreq/longhaul.c
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (5359534505c7 EDAC, i7core: Remove double buffering of error records)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (904d1857ad09 tracing: Remove unused function trace_current_buffer_lock_reserve())
Merging rcu/rcu/next (16d7afcaa530 rcu: No ordering for rcu_assign_pointer() of NULL)
Applying: Revert "rcu: No ordering for rcu_assign_pointer() of NULL"
Merging kvm/linux-next (05b1159e641f Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next)
Merging kvm-arm/next (02e0b7600f83 arm64: kvm: Add support for 16K pages)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (0c5022f50844 KVM: s390: document KVM_CAP_S390_RI)
Merging xen-tip/linux-next (d2c6bd8d6259 xen/x86: don't lose event interrupts)
CONFLICT (content): Merge conflict in drivers/xen/efi.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c
Applying: xen: efi: merge fix patch
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (e55c35cf41c9 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (19d46ee1aec0 asus-laptop: correct error handling in sysfs_acpi_set)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (f15c65afddbe leds: ss4200: add DMI data for FSC SCALEO Home Server)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (8ac0fba2da41 isa: Decouple X86_32 dependency from the ISA Kconfig option)
[master e5e926fadff5] Revert "isa: Decouple X86_32 dependency from the ISA Kconfig option"
Merging tty/tty-next (fa01e2ca9f53 serial: 8250: Integrate Fintek into 8250_base)
CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next (dc5878abf49c usb: core: move root hub's device node assignment after it is added to bus)
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (8c34d82e9dc6 USB: serial: use IS_ENABLED() instead of checking for FOO || FOO_MODULE)
Merging usb-chipidea-next/ci-for-usb-next (4e332df63487 usb: otg-fsm: support multiple instances)
Merging staging/staging-next (99aded71b52c Staging: drivers: rtl8188eu: use sizeof(*ptr) instead of sizeof(struct))
CONFLICT (content): Merge conflict in drivers/iio/magnetometer/ak8975.c
Merging char-misc/char-misc-next (0a19f129d71f w1: add ability to set (SRAM) and store (EEPROM) configuration for temp sensors like DS18B20)
CONFLICT (content): Merge conflict in drivers/hv/ring_buffer.c
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (e0f00aff2dcc Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (3bc07b38a251 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (9fa5482fbd17 Merge branch 'devel' into for-next)
Merging vhost/linux-next (e00f7bd22129 virtio: Silence uninitialized variable warning)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (43e689b917d7 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (58657d189a2f Merge branch 'clk-hw-register' (early part) into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (620a7feb9b3c coresight: etb10: adjust read pointer only when needed)
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm4x.h
Merging rtc/rtc-next (820c5327d631 rtc: ds3232: fix call trace when rtc->ops_lock is used as NULL)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Merging akpm-current/current (59eebedc7dd4 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in include/linux/efi.h
CONFLICT (content): Merge conflict in arch/tile/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/64/pgtable.h
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (content): Merge conflict in arch/cris/Kconfig
Applying: mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: mm: make mmap_sem for write waits killable for mm syscalls
Applying: mm: make vm_mmap killable
Applying: mm: make vm_munmap killable
Applying: mm, aout: handle vm_brk failures
Applying: mm, elf: handle vm_brk error
Applying: mm: make vm_brk killable
Applying: mm, proc: make clear_refs killable
Applying: mm, fork: make dup_mmap wait for mmap_sem for write killable
Applying: ipc, shm: make shmem attach/detach wait for mmap_sem killable
Applying: vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
Applying: coredump: make coredump_wait wait for mmap_sem for write killable
Applying: aio: make aio_setup_ring killable
Applying: exec: make exec path waiting for mmap_sem killable
Applying: prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
Applying: uprobes: wait for mmap_sem for write killable
Applying: drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable
Applying: drm/radeon: make radeon_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get
Merging akpm/master (94f058ac6568 drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get)
Applying: mm: make optimistic check for swapin readahead fix

linux-next: Tree for May 2

[Stephen Rothwell]

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

Hi all,

This tree still fails (more than usual) the powerpc allyesconfig build.

Changes since 20140501:

The powerpc tree still had its build failure.

Non-merge commits (relative to Linus' tree): 3658
 3376 files changed, 122496 insertions(+), 79513 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" as mentioned in the FAQ on the wiki
(see below).

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 and an allmodconfig for x86_64 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm
defconfig.

Below is a summary of the state of the merge.

I am currently merging 216 trees (counting Linus' and 29 trees of patches
pending for Linus' tree).

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (b5f3c61d0616 Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator)
Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1)
Merging arc-current/for-curr (a798c10faf62 Linux 3.15-rc2)
Merging arm-current/fixes (d93003e8e4e1 ARM: 8042/1: iwmmxt: allow to build iWMMXt on Marvell PJ4B)
Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1)
Merging metag-fixes/fixes (a798c10faf62 Linux 3.15-rc2)
Merging powerpc-merge/merge (e4565362c7ad powerpc/4xx: Fix section mismatch in ppc4xx_pci.c)
Merging sparc/master (a798c10faf62 Linux 3.15-rc2)
Merging net/master (22041fb05b66 hyperv: Properly handle checksum offload)
Merging ipsec/master (a32452366b72 vti4: Don't count header length twice.)
CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c
Merging sound-current/for-linus (91943954e353 ALSA: hda - add headset mic detect quirk for a Dell laptop)
Merging pci-current/for-linus (f5d3352b2751 PCI: tegra: Use new OF interrupt mapping when possible)
Merging wireless/master (3234f5b06fc3 rtl8192cu: Fix unbalanced irq enable in error path of rtl92cu_hw_init())
Merging driver-core.current/driver-core-linus (d1db0eea8524 Linux 3.15-rc3)
Merging tty.current/tty-linus (d1db0eea8524 Linux 3.15-rc3)
Merging usb.current/usb-linus (4dd7aa0f3c8a Merge tag 'fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval)
Merging staging.current/staging-linus (86281966c739 Merge tag 'iio-fixes-for-3.15b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (d1db0eea8524 Linux 3.15-rc3)
Merging input-current/for-linus (c16134976fb2 Input: tca8418 - fix loading this driver as a module from a device tree)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (27c5fb7a8424 crypto: caam - add allocation failure handling in SPRINTFCAT macro)
Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (58b116bce136 drivercore: deferral race condition fix)
Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging drm-intel-fixes/for-linux-next-fixes (b6842feb63a2 drm/i915: Allow user modes to exceed DVI 165MHz limit)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (134aeaed08c4 ARC: Fixed spelling errors within comments)
Merging arm/for-next (c34eb07ff897 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-kvm-cpuresume/arm-kvm-cpuresume (91a3f6af430d arm: kernel: sleep: restore HYP mode configuration in cpu_resume)
Merging arm-perf/for-next/perf (c9eaa447e77e Linux 3.15-rc1)
Merging arm-soc/for-next (1fc52762e33c Merge tag 'vexpress/fixes-for-3.15' of git://git.linaro.org/people/pawel.moll/linux into fixes)
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
Merging berlin/berlin/for-next (ca8965fd2af1 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (72e0a509056f Merge branch 'imx/dt' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (47fc77cc704e Merge branch 'for_3.15/fixes' into next)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (9322fc41d2fc Merge branch 'mvebu/dt' into for-next)
Merging renesas/next (1dcb57aa37dc Merge branch 'heads/dt-for-v3.16' into next)
Merging samsung/for-next (3c27f314c676 ARM: S3C24XX: convert s3c2412 to common clock framework)
Merging tegra/for-next (fd8d5bf30738 Merge branch for-3.16/defconfig into for-next)
Merging arm64/for-next/core (ebf81a938dad arm64: Fix DMA range invalidation for cache line unaligned buffers)
Merging blackfin/for-linus (c4a2c58d2095 blackfin: cleanup board files)
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf)
Merging m68k/for-next (50be9eba831d m68k: Update defconfigs for v3.14-rc1)
Merging m68knommu/for-next (6c9665257d5a m68k: fix a compiler warning when building for DragonBall)
Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE)
Merging microblaze/next (a66a626538af microblaze: Use asm-generic/io.h)
Merging mips/mips-for-linux-next (458d4f8b5328 Merge branch '3.15-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (ba6728f596a6 Merge tag 'pinctrl-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
Merging powerpc/next (5a4e58bc693f powerpc/mm: use macro PGTABLE_EADDR_SIZE instead of digital)
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (164739eff3f9 s390/pci: add some new arch specific pci attributes)
Merging sparc-next/master (8cf749a8f506 Merge branch 'sparc32-sparse')
Merging tile/master (5eb0bdf84433 arch/tile: remove unused variable 'devcap')
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (cfe8255f0afc xtensa: xt2000: drop redundant sysmem initialization)
Merging btrfs/next (00fdf13a2e9f Btrfs: fix a crash of clone with inline extents's split)
Merging ceph/master (a30be7cb2ccb ceph: skip invalid dentry during dcache readdir)
Merging cifs/for-next (a87c9ad95667 cifs: fix actimeo=0 corner case when cifs_i->time == jiffies)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (9e78d14a9f64 Use %pd in eCryptFS)
Merging ext3/for_next (01d8885785a6 reiserfs: fix race in readdir)
Merging ext4/dev (26f9c9ac0a11 ext4: add fallocate mode blocking for debugging purposes)
Merging f2fs/dev (26a7fca93f16 f2fs: deactivate inode page if the inode is evicted)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
Merging fuse/for-next (1560c974dcd4 fuse: add renameat2 support)
Merging gfs2/master (5a7c6690c275 GFS2: lops.c: replace 0 by NULL for pointers)
Merging jfs/jfs-next (24e4a0f3de21 fs/jfs/jfs_inode.c: atomically set inode->i_flags)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (1f2edbe3fe21 NFS: Don't ignore suid/sgid bit changes after a successful write)
Merging nfsd/nfsd-next (06f9cc12caa8 nfsd4: don't create unnecessary mask acl)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
Merging v9fs/for-next (c9eaa447e77e Linux 3.15-rc1)
Merging ubifs/linux-next (d56030ac25d3 UBI: block: Remove __initdata from ubiblock_param_ops)
Merging xfs/for-next (b8b39d39f94c Merge branch 'xfs-free-inode-btree' into for-next)
Merging file-private-locks/linux-next (3df94d40d8fa locks: add some tracepoints in the lease handling code)
Merging vfs/for-next (673b65614f0c kill generic_file_splice_write())
CONFLICT (content): Merge conflict in fs/f2fs/file.c
Merging pci/next (518a6a34f645 Merge branches 'pci/hotplug', 'pci/msi', 'pci/virtualization' and 'pci/misc' into next)
Merging hid/for-next (9795762e2a7e Merge branch 'for-3.16/upstream' into for-next)
Merging i2c/i2c/for-next (d1db0eea8524 Linux 3.15-rc3)
Merging jdelvare-hwmon/master (c9eaa447e77e Linux 3.15-rc1)
Merging hwmon-staging/hwmon-next (d60ba715cd76 hwmon: (vt1211) remove unnecessary OOM messages)
Merging v4l-dvb/master (b40dfe97cc3a Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (42651ec91af5 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (49686b98a059 Merge branch 'for-3.16' into for-next)
Merging pm/linux-next (d3b6390a653b Merge branch 'cpufreq-macros' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/loongson/lemote-2f/clock.c
Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release)
Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (9477165ec525 thermal: rcar-thermal: update thermal zone only when temperature changes)
Merging ieee1394/for-next (0ca49345b6f4 firewire: ohci: fix probe failure with Agere/LSI controllers)
Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages)
Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2))
Merging slave-dma/next (d54b64156deb Merge branch 'topic/xilinx' into next)
Merging dmaengine/next (b9bf6d2e84b7 dma: mv_xor: Flush descriptors before activating a channel)
Merging net-next/master (c25aaf814a63 hyperv: Enable sendbuf mechanism on the send path)
CONFLICT (content): Merge conflict in net/netlink/af_netlink.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/altera/altera_sgdma.c
Merging ipsec-next/master (2e71029e2c32 xfrm: Remove useless xfrm_audit struct.)
Merging wireless-next/master (48d11dc37977 rsi: Changing opcode for sta mode according to changes in firmware)
Merging bluetooth/master (22e70786413e Bluetooth: Remove hci_h4 unused defines)
Merging infiniband/for-next (7d0a73a40c5c RDMA/cxgb4: Update Kconfig to include Chelsio T5 adapter)
Merging mtd/master (28c015a9daab mtd: davinci-nand: disable subpage write for keystone-nand)
Merging l2-mtd/master (35fc51956b53 mtd: nand: fix a typo in a comment line)
Merging crypto/master (9f84951fc6f3 crypto: atmel-aes - check alignment of cfb64 mode)
CONFLICT (rename/delete): drivers/crypto/bfin_crc.h deleted in HEAD and renamed in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.h left in tree.
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
Merging drm/drm-next (444c9a08bf78 Merge branch 'drm-init-cleanup' of git://people.freedesktop.org/~danvet/drm into drm-next)
Merging drm-panel/drm/panel/for-next (810e49d8978f drm/panel: add support for LG LD070WX3-SL01 panel)
Merging drm-intel/for-linux-next (e5c03ca36281 drm/i915/sdvo: Remove ->mode_set callback)
Merging drm-tegra/drm/tegra/for-next (4b9701e02b3b drm/tegra: hdmi - Add Tegra124 support)
Merging sound/for-next (02fd1a76bfeb ALSA: fm801: introduce fm801_ac97_is_ready()/fm801_ac97_is_valid() helpers)
Merging sound-asoc/for-next (86f4c423e813 Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (51e158c12aca param: hand arguments after -- straight to init)
Merging virtio/virtio-next (e75279c4fb85 virtio_ccw: introduce device_lost in virtio_ccw_device)
Merging input/next (0aa21e226149 Input: gpio-beeper - simplify GPIO handling)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (2041a6e1eea7 Merge branch 'for-3.16/drivers' into for-next)
Merging device-mapper/for-next (131cd131a9ff dm cache: fix writethrough mode quiescing in cache_map)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (865042c01637 mmc: Add realtek USB sdmmc host driver)
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
Merging slab/for-next (34bf6ef94a83 mm: slab/slub: use page->list consistently instead of page->lru)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (e2f23b606b94 md: avoid oops on unload if some process is in poll or select.)
Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
Merging mfd-lj/for-mfd-next (06ed83a1566a mfd: sec-core: Remove duplicated device type from sec_pmic_dev)
Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (a798c10faf62 Linux 3.15-rc2)
Merging regulator/for-next (01bd9b79cbec Merge remote-tracking branches 'regulator/topic/arizona', 'regulator/topic/axp20', 'regulator/topic/of', 'regulator/topic/pbias', 'regulator/topic/s2mps11', 'regulator/topic/s5m8767', 'regulator/topic/tps65090' and 'regulator/topic/tps65217' into regulator-next)
CONFLICT (content): Merge conflict in drivers/regulator/tps65090-regulator.c
Merging security/next (fab71a90edda security: Convert use of typedef ctl_table to struct ctl_table)
Merging selinux/next (6d32c850621b Merge tag 'v3.14' into next)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (4a4d559006e7 watchdog: via_wdt: replace del_timer by del_timer_sync)
Merging iommu/next (57c343bad18f Merge branches 'iommu/fixes' and 'arm/omap' into next)
Merging dwmw2-iommu/master (5ae0566a0fff iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors)
Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES)
Merging osd/linux-next (f1f6630b53e7 MAINTAINERS: Update email address for bhalevy)
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
Merging trivial/for-next (c800bcd5f53f sparse: fix comment)
Merging audit/master (35d0c383e526 sparc: implement is_32bit_task)
CONFLICT (content): Merge conflict in kernel/audit.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (d88cf7d7b424 Merge remote-tracking branch 'robh/for-next' into devicetree/next)
Merging dt-rh/for-next (c3fc952d2fbe of: push struct boot_param_header and defines into powerpc)
Merging spi/for-next (889393d7a047 Merge remote-tracking branches 'spi/topic/oom', 'spi/topic/pxa2xx', 'spi/topic/sirf' and 'spi/topic/workqueue' into spi-next)
Merging tip/auto-latest (c3d94576af33 Merge branch 'x86/uv')
Merging clockevents/clockevents/next (09e15176ded1 clocksource: exynos_mct: silence a static checker warning)
Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG)
Merging edac-amd/for-next (c045ebdf6079 Merge branch 'edac-for-3.15' into for-next)
Merging ftrace/for-next (b1169cc69ba9 tracing: Remove mock up poll wait function)
Merging rcu/rcu/next (15af2a9fb5c3 rcu: Variable name changed in tree_plugin.h and used in tree.c)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (198c74f43f0f KVM: MMU: flush tlb out of mmu lock when write-protect the sptes)
Merging kvm-arm/next (198c74f43f0f KVM: MMU: flush tlb out of mmu lock when write-protect the sptes)
Merging kvm-ppc/kvm-ppc-next (0f689a33ad17 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (0a25e113b480 Merge branch 'devel/for-linus-3.15' into linux-next)
Merging percpu/for-next (4abee313c9a8 Merge branch 'for-3.16' into for-next)
Merging workqueues/for-next (534a3fbb3f37 workqueue: simplify wq_update_unbound_numa() by jumping to use_dfl_pwq if the target cpumask equals wq's)
Merging drivers-x86/linux-next (7a70906e55bf alienware-wmi: cover some scenarios where memory allocations would fail)
Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (ef298cbafb9d Merge remote-tracking branches 'regmap/topic/le', 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/smbus' into regmap-next)
Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (c73bcf7cca71 leds: 88pm860x: Fix missing refcount decrement for parent of_node)
Merging driver-core/driver-core-next (d35cc56ddfc9 Merge 3.15-rc3 into staging-next)
Merging tty/tty-next (f379a071091b Merge 3.15-rc3 into tty-next)
Merging usb/usb-next (53971a86d2db Merge 3.15-rc3 into usb-next)
Merging usb-gadget/next (041832565e40 usb: phy: mv-u3d: switch over to writel/readl)
CONFLICT (modify/delete): drivers/usb/phy/phy-mv-u3d-usb.c deleted in HEAD and modified in usb-gadget/next. Version usb-gadget/next of drivers/usb/phy/phy-mv-u3d-usb.c left in tree.
$ git rm -f drivers/usb/phy/phy-mv-u3d-usb.c
Merging staging/staging-next (37aa48368f25 Merge 3.15-rc3 into staging-next)
CONFLICT (content): Merge conflict in drivers/iio/adc/Kconfig
Merging char-misc/char-misc-next (d1db0eea8524 Linux 3.15-rc3)
Merging cgroup/for-next (9f30813bbca6 Merge branch 'for-3.16' into for-next)
Merging scsi/for-next (1a2184c0d747 [SCSI] More USB deadlock fixes)
Merging target-updates/for-next (b076808051f2 ib_srpt: Use correct ib_sg_dma primitives)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (d1b2402c203b Merge branch 'devel' into for-next)
Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (4e6a8ae77deb Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (59f0f119e85c arm: dma-mapping: Fix mapping size value)
Merging pwm/for-next (093e00bb3f82 pwm: lpss: Add support for PCI devices)
Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7)
Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files)
CONFLICT (content): Merge conflict in fs/namespace.c
CONFLICT (content): Merge conflict in fs/namei.c
CONFLICT (content): Merge conflict in fs/dcache.c
Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (4fdd44dfb5bd Merge branch 'clk-fixes' into clk-next)
Merging random/dev (7b878d4b48c4 random: Add arch_has_random[_seed]())
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
Merging aio/master (fa88b6f8803c aio: cleanup: flatten kill_ioctx())
Merging llvmlinux/for-next (4f6d454aae03 unwind_support)
Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
Merging rd-docs/master (c9e7f4124daa The sum at the beginning of line "intr" includes also unnumbered interrupts. It implies that the sum at the beginning isn't the sum of the remainder of the line, not even an estimation.)
Merging akpm-current/current (9d325a9c00bb sysrq,rcu: suppress RCU stall warnings while sysrq runs)
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/hw_nmi.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: mm/page_io.c: work around gcc bug
Applying: arm: convert use of typedef ctl_table to struct ctl_table
Applying: ia64: convert use of typedef ctl_table to struct ctl_table
Applying: tile: convert use of typedef ctl_table to struct ctl_table
Applying: cdrom: convert use of typedef ctl_table to struct ctl_table
Applying: random: convert use of typedef ctl_table to struct ctl_table
Applying: parport: convert use of typedef ctl_table to struct ctl_table
Applying: scsi: convert use of typedef ctl_table to struct ctl_table
Applying: coda: convert use of typedef ctl_table to struct ctl_table
Applying: fscache: convert use of typedef ctl_table to struct ctl_table
Applying: lockd: convert use of typedef ctl_table to struct ctl_table
Applying: nfs: convert use of typedef ctl_table to struct ctl_table
Applying: inotify: convert use of typedef ctl_table to struct ctl_table
Applying: ntfs: convert use of typedef ctl_table to struct ctl_table
Applying: fs: convert use of typedef ctl_table to struct ctl_table
Applying: key: convert use of typedef ctl_table to struct ctl_table
Applying: ipc: convert use of typedef ctl_table to struct ctl_table
Applying: sysctl: convert use of typedef ctl_table to struct ctl_table
Applying: mm: convert use of typedef ctl_table to struct ctl_table
Applying: mfd/rtc: sec/s5m: rename SEC* symbols to S5M
Applying: rtc: s5m: remove undocumented time init on first boot
Applying: rtc: s5m: use shorter time of register update
Applying: rtc: s5m: support different register layout
Applying: rtc: s5m: add support for S2MPS14 RTC
Applying: rtc: s5m: consolidate two device type switch statements
Applying: blackfin/ptrace: call find_vma with the mmap_sem held
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: arm: move arm_dma_limit to setup_dma_zone
Applying: ufs: sb mutex merge + mutex_destroy
Applying: mm: add strictlimit knob
Merging akpm/master (ab92c7e64489 mm: add strictlimit knob)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: Tree for May 2

[Stephen Rothwell]

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

On Tue, 22 May 2012 18:30:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> Changes since 201205018:

Just in case you are as confused as I was, it should have been:

Subject: linux-next: Tree for May 22

Changes since 20120521:

:-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: Tree for May 2

[Stephen Rothwell]

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

Hi all,

Changes since 201205018:

With the merge window open, conflicts are moving from tree to tree.

The i386 defconfig build is still broken and now the sparc32 defconfig is
broken as well.

The ceph tree gained a conflict against Linus' tree.

The nfs tree gained a conflict against Linus' tree.

The infiniband tree lost its build failure.

The net-next tree lost its conflicts.

The mfd tree gained conflicts against Linus' tree and still has its build
failure so I used the version from next-20120511.

The trivial tree gained conflicts against Linus' tree and the mips tree.

The tip tree gained a conflict against Linus' tree.  I also added a patch
for a PowerPC boot problem.

The kvm-ppc tree lost its conflict.

The usb tree lost its build failure.

The userns tree gained a conflict against Linus' tree.

The akpm tree lost a conflict.

----------------------------------------------------------------------------

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" as mentioned in the FAQ on the wiki
(see below).

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 and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 189 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (c23ddf7 Merge tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (e88aa7b Fix modpost failures in fedora 17)
Merging arm-current/fixes (56cb248 ARM: 7419/1: vfp: fix VFP flushing regression on sigreturn path)
Merging ep93xx-current/ep93xx-fixes (2b3c83e dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels)
Merging m68k-current/for-linus (f25e918 m68k: Setup CROSS_COMPILE at the top)
Merging powerpc-merge/merge (7c0482e powerpc/irq: Fix another case of lazy IRQ state getting out of sync)
Merging sparc/master (31a6710 Fix blocking allocations called very early during bootup)
Merging net/master (31a6710 Fix blocking allocations called very early during bootup)
Merging sound-current/for-linus (382e6a8 Merge branch 'topic/misc' into for-linus)
CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c
CONFLICT (content): Merge conflict in drivers/base/regmap/regmap-irq.c
CONFLICT (content): Merge conflict in drivers/base/regmap/internal.h
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (671267b Bluetooth: mgmt: Fix device_connected sending order)
Merging driver-core.current/driver-core-linus (69964ea Linux 3.4-rc5)
Merging tty.current/tty-linus (d48b97b Linux 3.4-rc6)
Merging usb.current/usb-linus (36be505 Linux 3.4-rc7)
Merging staging.current/staging-linus (69964ea Linux 3.4-rc5)
Merging char-misc.current/char-misc-linus (e816b57 Linux 3.4-rc3)
Merging input-current/for-linus (899c612 Input: synaptics - fix regression with "image sensor" trackpads)
Merging md-current/for-linus (b0d634d md/raid10: fix transcription error in calc_sectors conversion.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (3c3c801 Merge branch 'sh/urgent' into sh-fixes-for-linus)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (766644d of/irq: add empty irq_of_parse_and_map() for non-dt builds)
Merging spi-current/spi/merge (ba2092c spi/topcliff: use correct __devexit_p annotation)
Merging gpio-current/gpio/merge (7fd0fcf gpio/pch: Fix build failure when selected as a module)
Merging arm/for-next (490c332 Merge branch 'v3-removal' into for-next)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (672552a blackfin: fix build after add bf60x mach/pm.h)
Merging c6x/for-linux-next (8ff98b9 C6X: remove unused config items)
Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile)
Merging hexagon/linux-next (4bd8193 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (4035c6d [IA64] Liberate the signal layer from IA64 assembler)
Merging m68k/for-next (f25e918 m68k: Setup CROSS_COMPILE at the top)
Merging m68knommu/for-next (7094ac0 m68k: add a defconfig for the M5475EVB ColdFire with MMU board)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (e9ade1e Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next)
Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
Merging parisc/for-next (07e85b2 [PARISC] fix TLB fault path on PA2.0 narrow systems)
Merging powerpc/next (be6dc53 powerpc: Fix irq distribution)
Merging 4xx/next (dce4c92 powerpc/40x: Use {upper,lower}_32_bits for msi_phys)
Merging mpc5xxx/next (f8d5842 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (a7475af s390/ap: Fix wrong or missing comments)
Merging sh/sh-latest (c30b9c4 sh: Enable PIO API for hp6xx and se770x.)
Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup)
Merging tile/master (9c27eda arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (35f9f8a libceph: avoid unregistering osd request when not registered)
CONFLICT (content): Merge conflict in net/ceph/osdmap.c
CONFLICT (content): Merge conflict in net/ceph/messenger.c
Merging cifs/for-next (05d013e cifs: Fix comment as d_alloc_root() is replaced by d_make_root())
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (0324876 ext2: trivial fix to comment for ext2_free_blocks)
Merging ext4/dev (f1d470b ext4: add metadata checksumming to the list of supported features)
Merging fuse/for-next (203627b fuse: fix blksize calculation)
Merging gfs2/master (500242a GFS2: Fix quota adjustment return code)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (1240c76 Merge branches 'nfs-for-next' and 'devel' into linux-next)
CONFLICT (content): Merge conflict in fs/nfs/nfs4proc.c
Merging nfsd/nfsd-next (8be4df8 nfsd4: move rq_flavor into svc_cred)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (62f38455 UBI: modify ubi_wl_flush function to clear work queue for a lnum)
Merging xfs/for-next (14c26c6 xfs: add trace points for log forces)
Merging vfs/for-next (9448152 sch_atm.c: get rid of poinless extern)
Merging pci/next (5420e46 microblaze/PCI: fix "io_offset undeclared" error)
Merging hid/for-next (d53c833 Merge branch 'wacom' into for-next)
Merging quilt/i2c (f7c1584 i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (9868a06 i2c: davinci: Free requested IRQ in remove)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (dc39bdf hwmon: (it87) Make temp3 attribute conditional for IT8782F)
Merging v4l-dvb/master (20a2218 Merge /home/v4l/v4l/patchwork)
Merging kbuild/for-next (82f4625 Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
CONFLICT (content): Merge conflict in arch/sparc/boot/Makefile
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (8d899e7 libata-eh don't waste time retrying media errors (v3))
Merging infiniband/for-next (e979fb9 Merge branch 'mlx4' into for-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be_main.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be_cmds.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
Merging acpi/next (29bdc67 Merge branch 'pss-workaround' into next)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (26c72e2 firewire: sbp2: document the absence of alignment requirements)
Merging ubi/linux-next (d48b97b Linux 3.4-rc6)
Merging dlm/next (75af271e dlm: NULL dereference on failure in kmem_cache_create())
Merging scsi/for-next (5373d19 Merge branch 'misc' into for-next)
Merging target-updates/for-next (f80e8ed iscsi-target: Fix iov_count calculation bug in iscsit_allocate_iovecs)
Merging target-merge/for-next-merge (ef872d2 Merge branch 'qla-target-merge' into for-next-merge)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6df8ea3 merge: devel rnc-devel fixes)
Merging slave-dma/next (1dd1ea8 dmaengine: at_hdmac: take maxburst from slave configuration)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (31a6710 Fix blocking allocations called very early during bootup)
Merging wireless-next/master (05f8f25 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next)
Merging bluetooth/master (4433c1e Bluetooth: Remove dead int returns)
Merging mtd/master (85cd83f JFFS2: Add parameter to reserve disk space for root)
Merging l2-mtd/master (d9c04f2 mtd: tests: use random32 instead of home-brewed generator)
CONFLICT (content): Merge conflict in drivers/mtd/nand/plat_nand.c
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/ixdp425-setup.c
Merging crypto/master (ef45b83 crypto: aesni-intel - move more common code to ablk_init_common)
CONFLICT (content): Merge conflict in drivers/crypto/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/devices-common.h
Merging drm/drm-next (f15b4ca Merge tag 'drm-intel-next-2012-05-20' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/gma500/psb_drv.c
Merging sound/for-next (ccce4ff Merge branch 'for-linus' into for-next)
Merging sound-asoc/for-next (abe2c7b Merge branch 'for-3.5' into asoc-next)
Merging quilt/rr (7f14929 virtio: fix typo in comment)
Merging input/next (829c4f9 Input: spear-keyboard - add device tree bindings)
Merging input-mt/for-next (66f75a5 Linux 3.4-rc4)
Merging cgroup/for-next (0d4dde1 res_counter: Account max_usage when calling res_counter_charge_nofail())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (2173105 Merge branch 'for-3.5/drivers' into for-next)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper (053388f After the failure of a group of paths, any alternative paths that need initialising do not become available until further I/O is sent to the device.  Until this has happened, ioctls return -EAGAIN.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (0caaa95 mmc: at91-mci: this driver is now deprecated)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (cac3ecf md: check the return of mddev_find())
Merging mfd/for-next (1fe17a2 mfd: Emulate active low IRQs as well as active high IRQs for wm831x)
CONFLICT (content): Merge conflict in include/linux/i2c/twl.h
CONFLICT (content): Merge conflict in drivers/regulator/tps65910-regulator.c
CONFLICT (content): Merge conflict in drivers/mfd/da9052-core.c
$ git reset --hard HEAD^
Merging refs/next/20120511/mfd
Merging battery/master (96facd2 smb347-charger: Include missing <linux/err.h>)
Merging fbdev/fbdev-next (5e7b911 drivers/video: fsl-diu-fb: don't initialize the THRESHOLDS registers)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (05dd0f5 OMAPDSS: DISPC: Update Accumulator configuration for chroma plane)
Merging regulator/for-next (7c1e25b regulator: palmas: Fix wrong kfree calls)
Merging security/next (cffee16 apparmor: fix long path failure due to disconnected path)
CONFLICT (content): Merge conflict in include/linux/filter.h
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (12879a8 Documentation/watchdog: close the fd when cmdline arg given)
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (ce74cec Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap' and 'arm/tegra' into next)
Merging osd/linux-next (8b56a30 exofs:  Add SYSFS info for autologin/pNFS export)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (a45170e xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer)
CONFLICT (modify/delete): sound/soc/imx/Kconfig deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of sound/soc/imx/Kconfig left in tree.
CONFLICT (content): Merge conflict in arch/mips/pci/pci-lantiq.c
CONFLICT (modify/delete): arch/mips/lantiq/xway/gpio_stp.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/mips/lantiq/xway/gpio_stp.c left in tree.
CONFLICT (modify/delete): arch/mips/lantiq/xway/gpio_ebu.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/mips/lantiq/xway/gpio_ebu.c left in tree.
$ git rm -f sound/soc/imx/Kconfig arch/mips/lantiq/xway/gpio_ebu.c arch/mips/lantiq/xway/gpio_stp.c
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (c32c821 epoll: Fix user space breakage related to EPOLLWAKEUP)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (6bd3dbf edac_mc: check for allocation failure in edac_mc_alloc())
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in drivers/edac/edac_core.h
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (8d6c1ef Merge branch 'devicetree/merge' into devicetree/next)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging tip/auto-latest (bf474fd Merge branch 'irq/core')
CONFLICT (content): Merge conflict in mm/memory.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/tile/Kconfig
CONFLICT (content): Merge conflict in arch/sparc/include/asm/thread_info_32.h
CONFLICT (content): Merge conflict in arch/sparc/Kconfig
CONFLICT (content): Merge conflict in arch/sh/kernel/process.c
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Makefile
Applying: kbuild: merge fix for sorting exceptions tables at build time
Applying: sched, numa: Allocate node_queue on any node for offline nodes
Merging rcu/rcu/next (860e1cc rcu: Fix broken strings in RCU's source code.)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (46a6dd1 KVM: s390: onereg for timer related registers)
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_para.h
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_segment.S
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging kvm-ppc/kvm-ppc-next (35bb16e powerpc/kvm: Fix VSID usage in 64-bit "PR" KVM)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (bdb1a8b Revert "xen: EXPORT_SYMBOL set_phys_to_machine")
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (641b695 percpu: remove percpu_xxx() functions)
CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c
Merging workqueues/for-next (4d82a1d lockdep: fix oops in processing workqueue)
Merging drivers-x86/linux-next (ad229c5 toshiba_acpi: Add support for transflective LCD)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (c948ef3 mfd: palmas PMIC device support Kconfig)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (94ca629 uio_pdrv_genirq: get irq through platform resource if not set otherwise)
Merging tty/tty-next (59bd234 serial: bfin_uart: Make MMR access compatible with 32 bits bf609 style controller.)
Merging usb/usb-next (cda4db5 Merge tag 'for-usb-next-2012-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-next)
CONFLICT (modify/delete): drivers/usb/core/inode.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/core/inode.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/media/easycap/easycap_main.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath6kl/usb.c
CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_wac.c
$ git rm -f drivers/usb/core/inode.c
Merging staging/staging-next (c3c6cc9 Staging: bcm: Remove two unused variables from Adapter.h)
CONFLICT (modify/delete): drivers/staging/serial/68360serial.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/serial/68360serial.c left in tree.
CONFLICT (modify/delete): drivers/staging/quatech_usb2/quatech_usb2.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/quatech_usb2/quatech_usb2.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/media/easycap/easycap_main.c
CONFLICT (content): Merge conflict in drivers/staging/line6/driver.c
CONFLICT (content): Merge conflict in drivers/staging/android/Makefile
CONFLICT (content): Merge conflict in drivers/staging/android/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
$ git rm -f drivers/staging/serial/68360serial.c drivers/staging/quatech_usb2/quatech_usb2.c
Merging char-misc/char-misc-next (9912143 parport: remove unused dead code from lowlevel drivers)
CONFLICT (content): Merge conflict in drivers/extcon/extcon-max8997.c
Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next)
Merging writeback/writeback-for-next (169ebd9 writeback: Avoid iput() from flusher thread)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (4f6a16b pinctrl: pinctrl-imx: add imx51 pinctrl driver)
Merging tegra/for-next (ef14f5c Merge branch 'for-3.5/defconfig2' into for-next)
Merging moduleh/for-sfr (bb8187d MCA: delete all remaining traces of microchannel bus support.)
Merging vhost/linux-next (53ffd22 virtio-net: remove useless disable on freeze)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (d48b97b Linux 3.4-rc6)
Merging irqdomain/irqdomain/next (a87487e irqdomain: Document size parameter of irq_domain_add_linear())
Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-samsung.c
Merging arm-soc/for-next (71d6afd Merge branch 'late/board' into for-next)
CONFLICT (content): Merge conflict in sound/soc/mxs/mxs-saif.c
CONFLICT (content): Merge conflict in lib/Makefile
CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c
CONFLICT (modify/delete): drivers/mfd/ab5500-core.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/mfd/ab5500-core.c left in tree.
CONFLICT (content): Merge conflict in drivers/gpio/gpio-samsung.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxs.c
CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in arch/arm/plat-omap/counter_32k.c
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/roadrunner.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/roadrunner.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/pci.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/ixdp2351.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/ixdp2351.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp23xx/include/mach/platform.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp23xx/include/mach/platform.h left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/pci.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/pci.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2x01.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2x01.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2800.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2800.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/ixdp2400.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/ixdp2400.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/include/mach/platform.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/include/mach/platform.h left in tree.
CONFLICT (modify/delete): arch/arm/mach-ixp2000/enp2611.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-ixp2000/enp2611.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-universal_c210.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/mach-nuri.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git rm -f drivers/mfd/ab5500-core.c
$ git rm -f -r arch/arm/mach-ixp2000 arch/arm/mach-ixp23xx
Applying: ARM:at91: merge fixup for dtsi file
Merging ep93xx/ep93xx-cleanup (a1eacd7 arm: ep93xx: use gpio_led_register_device)
Merging renesas/next (76ab1e9 Merge branch 'renesas-emev2' into renesas-next)
Merging s5p/for-next (3bd5eba Merge branch 'next/board-samsung-2' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging kvmtool/master (cdb90a0 kvm tools: increase amount of virtio-9p FIDs)
Merging dma-mapping/dma-mapping-next (b7ef7df Merge branch 'for-next-other' into for-next)
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging dma-buf/for-next (700cbdb dma-buf: add vmap interface)
Merging userns/for-next (4b06a81 userns:  Silence silly gcc warning.)
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in fs/stat.c
Applying: userns: fix up for user_ns move to struct cred
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: pagemap.h: fix warning about possibly used before init var
Applying: umem: fix up unplugging
Applying: cciss: fix incorrect scsi status reporting
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cpuidle: remove unused hrtimer_peek_ahead_timers() call
Applying: cpuidle: add checks to avoid NULL pointer dereference
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: drivers/thermal/spear_thermal.c: add Device Tree probing capability
Applying: unicore32: use block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic
Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: fsnotify: remove unused parameter from send_to_group()
Applying: fsnotify: handle subfiles' perm events
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy()
Applying: mm/hugetlb.c: use long vars instead of int in region_count()
Applying: mm, thp: remove unnecessary ret variable
Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd
Applying: mm: remove swap token code
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: do not stall on writeback during memory compaction
Applying: mm: vmscan: remove reclaim_mode_t
Applying: hugetlb: rename max_hstate to hugetlb_max_hstate
Applying: hugetlbfs: don't use ERR_PTR with VM_FAULT* values
Applying: hugetlbfs: add an inline helper for finding hstate index
Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: memcg: add HugeTLB extension
Applying: memcg-add-hugetlb-extension-fix
Applying: memcg-add-hugetlb-extension-fix-fix
Applying: hugetlb: add charge/uncharge calls for HugeTLB alloc/free
Applying: memcg: track resource index in cftype private
Applying: hugetlbfs: add memcg control files for hugetlbfs
Applying: memcg: use scnprintf instead of sprintf
Applying: hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix
Applying: hugetlbfs: add a list for tracking in-use HugeTLB pages
Applying: memcg: move HugeTLB resource count to parent cgroup on memcg removal
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix
Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix
Applying: hugetlb: migrate memcg info from oldpage to new page during migration
Applying: hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix
Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2
Applying: memcg: add memory controller documentation for hugetlb management
Applying: mm: fix off-by-one bug in print_nodes_state()
Applying: mm: use kcalloc() instead of kzalloc() to allocate array
Applying: mm/mmap.c: find_vma(): remove unnecessary if(mm) check
Applying: mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix
Applying: mm/fork: fix overflow in vma length when copying mmap on clone
Applying: mm/vmstat.c: remove debug fs entries on failure of file creation and made extfrag_debug_root dentry local
Applying: mm: correctly synchronize rss-counters at exit/exec
Applying: thp, memcg: split hugepage for memcg oom on cow
Applying: mm: do_migrate_pages() calls migrate_to_node() even if task is already on a correct node
Applying: mm-do_migrate_pages-calls-migrate_to_node-even-if-task-is-already-on-a-correct-node-fix
Applying: mm: do_migrate_pages(): rename arguments
Applying: kernel: cgroup: push rcu read locking from css_is_ancestor() to callsite
Applying: mm: memcg: count pte references from every member of the reclaimed hierarchy
Applying: mm-memcg-count-pte-references-from-every-member-of-the-reclaimed-hierarchy-fix
Applying: mm: rename is_mlocked_vma() to mlocked_vma_newpage()
Applying: mm-rename-is_mlocked_vma-to-mlocked_vma_newpage-fix
Applying: mm, thp: drop page_table_lock to uncharge memcg pages
Applying: Documentation: memcg: future proof hierarchical statistics documentation
Applying: Cross Memory Attach: make it Kconfigurable
Applying: bug: introduce BUILD_BUG_ON_INVALID() macro
Applying: bug: completely remove code generated by disabled VM_BUG_ON()
Applying: x86: print e820 physical addresses consistently with other parts of kernel
Applying: x86: print physical addresses consistently with other parts of kernel
Applying: swiotlb: print physical addresses consistently with other parts of kernel
Applying: mm: print physical addresses consistently with other parts of kernel
Applying: kbuild: install kernel-page-flags.h
Applying: tools/vm/page-types.c: cleanups
Applying: mm: move is_vma_temporary_stack() declaration to huge_mm.h
Applying: mm/page_alloc.c: remove pageblock_default_order()
Applying: mm: bootmem: fix checking the bitmap when finally freeing bootmem
Applying: mm: bootmem: remove redundant offset check when finally freeing bootmem
Applying: mm: bootmem: rename alloc_bootmem_core to alloc_bootmem_bdata
Applying: mm: bootmem: split out goal-to-node mapping from goal dropping
Applying: mm: bootmem: allocate in order node+goal, goal, node, anywhere
Applying: mm: bootmem: unify allocation policy of (non-)panicking node allocations
Applying: mm: nobootmem: panic on node-specific allocation failure
Applying: mm: nobootmem: unify allocation policy of (non-)panicking node allocations
Applying: mm: bootmem: pass pgdat instead of pgdat->bdata down the stack
Applying: mm: remove sparsemem allocation details from the bootmem allocator
Applying: mm-remove-sparsemem-allocation-details-from-the-bootmem-allocator-fix
Applying: mm: compaction: handle incorrect MIGRATE_UNMOVABLE type pageblocks
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: memcg: mark more functions/variables as static
Applying: memcg: remove unused variable
Applying: memcg: mark stat field of mem_cgroup struct as __percpu
Applying: memcg: remove redundant parentheses
Applying: memcg: make threshold index in the right position
Applying: memcg: revise the position of threshold index while unregistering event
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: memcg: add mlock statistic in memory.stat
Applying: memcg-add-mlock-statistic-in-memorystat-fix
Applying: mm/vmscan: store "priority" in struct scan_control
Applying: mm: add link from struct lruvec to struct zone
Applying: mm/vmscan: push lruvec pointer into isolate_lru_pages()
Applying: mm/vmscan: push zone pointer into shrink_page_list()
Applying: mm/vmscan: remove update_isolated_counts()
Applying: mm/vmscan: push lruvec pointer into putback_inactive_pages()
Applying: mm/vmscan: replace zone_nr_lru_pages() with get_lruvec_size()
Applying: mm/vmscan: push lruvec pointer into inactive_list_is_low()
Applying: mm/vmscan: push lruvec pointer into shrink_list()
Applying: mm/vmscan: push lruvec pointer into get_scan_count()
Applying: mm/vmscan: push lruvec pointer into should_continue_reclaim()
Applying: mm/vmscan: kill struct mem_cgroup_zone
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: CodingStyle: add kmalloc_array() to memory allocators
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: introduce SIZE_MAX
Applying: locking: add KERN_CONT when needed to self test
Applying: x86, NMI: add missing KERN_CONT to NMI selftest
Applying: ISDN: add missing KERN_CONT
Applying: clk: add non CONFIG_HAVE_CLK routines
Applying: clk: remove redundant depends on from drivers/Kconfig
Applying: i2c/i2c-pxa: remove conditional compilation of clk code
Applying: usb/marvell: remove conditional compilation of clk code
Applying: usb/musb: remove conditional compilation of clk code
Applying: ata/pata_arasan: remove conditional compilation of clk code
Applying: ata/sata_mv: remove conditional compilation of clk code
Applying: net/c_can: remove conditional compilation of clk code
Applying: net/stmmac: remove conditional compilation of clk code
Applying: gadget/m66592: remove conditional compilation of clk code
Applying: gadget/r8a66597: remove conditional compilation of clk code
Applying: usb/host/r8a66597: remove conditional compilation of clk code
Applying: kernel/resource.c: correct the comment of allocate_resource()
Applying: sethostname/setdomainname: notify userspace when there is a change in uts_kern_table
Applying: NMI watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix
Applying: watchdog: fix for lockup detector breakage on resume
Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2-fix
Applying: task_work_add: generic process-context callbacks
Applying: genirq: reimplement exit_irq_thread() hook via task_work_add()
Applying: hexagon: do_notify_resume() needs tracehook_notify_resume()
Applying: keys: change keyctl_session_to_parent() to use task_work_add()
Applying: keys: kill the dummy key_replace_session_keyring()
Applying: keys: kill task_struct->replacement_session_keyring
Applying: kernel/irq/manage.c: use the pr_foo() infrastructure to prefix printks
Applying: vsprintf: correctly handle width when '#' flag used in %#p format.
Applying: vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: hamradio/scc: orphan driver in MAINTAINERS
Applying: MAINTAINERS: remove Alessandro
Applying: blacklight: remove redundant spi driver bus initialization
Applying: lcd: add callbacks for early fb event blank support
Applying: fbdev: add events for early fb event support
Applying: drivers/video/backlight/apple_bl.c: include header for exported symbol prototypes
Applying: drivers-video-backlight-apple_blc-include-header-for-exported-symbol-prototypes-fix
Applying: backlight: add LM3533 backlight driver
Applying: backlight-add-lm3533-backlight-driver-fix
Applying: backlight-add-lm3533-backlight-driver-fix-fix
Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling
Applying: leds: driver for DA9052/53 PMIC v2
Applying: leds-led-module-for-da9052-53-pmic-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: lm3556: don't call kfree for the memory allocated by devm_kzalloc
Applying: leds: simple_strtoul() cleanup
Applying: leds: Use kcalloc instead of kzalloc to allocate array
Applying: leds: add new field to led_classdev struct to save activation state
Applying: leds: change existing triggers to use activated flag
Applying: leds: change ledtrig-timer to use activated flag
Applying: include/linux/led-lm3530.h: comment correction about the range of brightness
Applying: drivers/leds/leds-lm3530.c: simplify als configuration on initialization
Applying: leds: heartbeat: stop on shutdown
Applying: leds-heartbeat-stop-on-shutdown-v5
Applying: leds-heartbeat-stop-on-shutdown-checkpatch-fixes
Applying: leds: add new transient trigger for one shot timer activation
Applying: drivers/leds/leds-pca955x.c: fix race condition while setting brightness on several LEDs
Applying: list_debug: WARN for adding something already in the list
Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
Applying: lib/string_helpers.c: make arrays static
Applying: lib/bitmap.c: fix documentation for scnprintf() functions
Applying: vsprintf: fix %ps on non symbols when using kallsyms
Applying: spinlock_debug: print kallsyms name for lock
Applying: radix-tree: fix preload vector size
Applying: lib/vsprintf.c: "%#o",0 becomes '0' instead of '00'
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: init: disable sparse checking of the mount.o source files
Applying: rtc/spear: add Device Tree probing capability
Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
Applying: rtc: add ioctl to get/clear battery low voltage status
Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix
Applying: rtc: ds1307: remove superfluous initialization
Applying: rtc: ds1307: add trickle charger support
Applying: drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
Applying: drivers/rtc/rtc-lpc32xx.c: add device tree support
Applying: nilfs2: flush disk caches in syncing
Applying: HPFS: remove PRINTK() macro
Applying: fat: introduce special inode for managing the FSINFO block
Applying: fat: introduce mark_fsinfo_dirty helper
Applying: fat: mark superblock as dirty less often
Applying: fat: switch to fsinfo_inode
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod.c: fix kernel-doc warning
Applying: kmod: avoid deadlock from recursive kmod call
Applying: cred: remove task_is_dead() from __task_cred() validation
Applying: stack usage: add pid to warning printk in check_stack_usage
Applying: proc: clean up /proc/<pid>/environ handling
Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes
Applying: proc: unify ptrace_may_access() locking code
Applying: proc: remove mm_for_maps()
Applying: proc: use mm_access() instead of ptrace_may_access()
Applying: proc: don't do dummy rcu_read_lock/rcu_read_unlock on error path
Applying: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code
Applying: procfs: use more apprioriate types when dumping /proc/N/stat
Applying: proc: report file/anon bit in /proc/pid/pagemap
Applying: proc/smaps: carefully handle migration entries
Applying: proc/smaps: show amount of nonlinear ptes in vma
Applying: proc/smaps: show amount of hwpoison pages
Applying: proc: use IS_ERR_OR_NULL()
Applying: fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters
Applying: cpu: introduce clear_tasks_mm_cpumask() helper
Applying: arm: use clear_tasks_mm_cpumask()
Applying: powerpc: use clear_tasks_mm_cpumask()
Applying: sh: use clear_tasks_mm_cpumask()
Applying: blackfin: a couple of task->mm handling fixes
Applying: blackfin: fix possible deadlock in decode_address()
Applying: um: should hold tasklist_lock while traversing processes
Applying: um: fix possible race on task->mm
Applying: um: properly check all process' threads for a live mm
Applying: kernel/cpu.c: document clear_tasks_mm_cpumask()
Applying: kernel-cpuc-document-clear_tasks_mm_cpumask-fix
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc/mqueue: using vmalloc requires including vmalloc.h
Applying: mqueue: revert bump up DFLT_*MAX
Applying: mqueue: don't use kmalloc with KMALLOC_MAX_SIZE
Applying: mqueue: separate mqueue default value from maximum value
Applying: selftests: add mq_open_tests
Applying: ipc/mqueue: improve performance of send/recv
Applying: ipc-mqueue-improve-performance-of-send-recv-fix
Applying: ipc/mqueue: correct mq_attr_ok test
Applying: ipc-mqueue-correct-mq_attr_ok-test-fix
Applying: ipc/mqueue: strengthen checks on mqueue creation
Applying: ipc-mqueue-strengthen-checks-on-mqueue-creation-fix
Applying: tools/selftests: add mq_perf_tests
Applying: tools-selftests-add-mq_perf_tests-checkpatch-fixes
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: pidns: use task_active_pid_ns in do_notify_parent
Applying: pidns: guarantee that the pidns init will be the last pidns process reaped
Applying: pidns: make killed children autoreap
Applying: pidns-make-killed-children-autoreap-checkpatch-fixes
Applying: eventfd: change int to __u64 in eventfd_signal()
Applying: eventfd-change-int-to-__u64-in-eventfd_signal-fix
Applying: aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: c/r: fs, proc: Move children entry back to tid_base_stuff
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8 comment update
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: simplify PR_SET_MM on mm::code/data assignment
Applying: c-r-prctl-simplify-pr_set_mm-on-mm-code-data-assignment-fix
Applying: c/r: prctl: return -EFAULT instead of -EINVAL in case if underlied VMA is not found
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c/r: prctl: drop VMA flags test on PR_SET_MM_ stack data assignment
Applying: kconfig: update compression algorithm info
Applying: notify_change(): check that i_mutex is held
Applying: isdn-add-missing-kern_cont-fix
Merging quilt/akpm (43a9522 isdn-add-missing-kern_cont-fix)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: Tree for May 2

[Stephen Rothwell]

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

Hi all,

Changes since 20110429:

New tree: cpufreq-move

Dropped tree: xen

----------------------------------------------------------------------------

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/v2.6/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" as mentioned in the FAQ on the wiki
(see below).

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 and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 188 trees (counting Linus' and 28 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
CONFLICT (content): Merge conflict in fs/ubifs/super.c
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-core.c
CONFLICT (delete/modify): drivers/i2c/busses/i2c-intel-mid.c deleted in bjdooks-i2c/next-i2c and modified in HEAD. Version HEAD of drivers/i2c/busses/i2c-intel-mid.c left in tree.
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c
$ git rm -f drivers/i2c/busses/i2c-intel-mid.c
Applying: i2c-designware: mdelay use needs linux/delay.h inclusion
Applying: i2c: designware-pcidrv depends on PCI
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/omap3isp/isp.c
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_cs.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging cpufreq-move/move-drivers
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
CONFLICT (content): Merge conflict in security/selinux/avc.c
CONFLICT (content): Merge conflict in security/selinux/hooks.c
CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (delete/modify): arch/arm/mach-u300/gpio.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-u300/gpio.c left in tree.
$ git rm -f arch/arm/mach-u300/gpio.c
Merging audit/for-next
Merging suspend/linux-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
CONFLICT (content): Merge conflict in drivers/platform/x86/intel_pmic_gpio.c
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c
Merging staging/staging-next
CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_pci.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_pci.c left in tree.
CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_usb.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_usb.c left in tree.
$ git rm -f drivers/staging/rt2860/common/cmm_data_pci.c drivers/staging/rt2860/common/cmm_data_usb.c
Merging slabh/slabh
Merging bkl-config/config
Merging cleancache/linux-next
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]