linux-next: Tree for Jan 15

[Stephen Rothwell]

Hi all,

Changes since 20150114:

The renesas tree gained a conflict against the arm-soc tree.

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

Non-merge commits (relative to Linus' tree): 2952
 2909 files changed, 90289 insertions(+), 49341 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 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 234 trees (counting Linus' and 32 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                    sfr@xxxxxxxxxxxxxxxx

$ git checkout master
$ git reset --hard stable
Merging origin/master (a6391a924cf5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory)
Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
Merging arm-current/fixes (1e3479225acb ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error)
Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk)
Merging powerpc-merge-mpe/fixes (a87e810f61b4 powerpc: Work around gcc bug in current_thread_info())
Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.)
Merging net/master (c637dbcedf31 Merge branch 'tg3-net')
Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.)
Merging sound-current/for-linus (92cb46584e10 ALSA: fireworks: fix an endianness bug for transaction length)
Merging pci-current/for-linus (97bf6af1f928 Linux 3.19-rc1)
Merging wireless-drivers/master (81a07128214e Merge tag 'wireless-drivers-for-davem-2015-01-09' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers)
Merging driver-core.current/driver-core-linus (72392ed0eb6f kernfs: Fix kernfs_name_compare)
Merging tty.current/tty-linus (31ec77aca72e serial: samsung: Add the support for Exynos5433 SoC)
Merging usb.current/usb-linus (06087cb42dc1 Merge tag 'fixes-for-v3.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
Merging usb-gadget-fixes/fixes (39e60635a015 usb: dwc3: gadget: Stop TRB preparation after limit is reached)
Merging usb-serial-fixes/usb-linus (04f9c6e6d175 usb: serial: handle -ENODEV quietly in generic_submit_read_urb)
Merging staging.current/staging-linus (a307d1d6d4cf staging: vt6655: fix sparse warning: argument type)
Merging char-misc.current/char-misc-linus (7b7c54914f73 mcb: mcb-pci: Only remap the 1st 0x200 bytes of BAR 0)
Merging input-current/for-linus (9333caeaeae4 Input: I8042 - add Acer Aspire 7738 to the nomux list)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (3e14dcf7cb80 crypto: add missing crypto module aliases)
Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap)
Merging rr-fixes/fixes (574732c73d15 param: initialize store function to NULL if not available.)
Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe())
Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test)
Merging drm-intel-fixes/for-linux-next-fixes (226e5ae9e5f9 drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES)
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
Merging arc/for-next (5840adceb962 arc: Remove unused prepare_to_copy())
Merging arm/for-next (1e3479225acb ARM: 8275/1: mm: fix PMD_SECT_RDONLY undeclared compile error)
Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1)
Merging arm-soc/for-next (fc4afdc062ef arm-soc: document merges)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging berlin/berlin/for-next (8553bf8fd181 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (bc8127e027df Merge branch 'imx/defconfig' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (82e1ad0bcd24 Merge branch 'mvebu/dt' into mvebu/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
Merging omap/for-next (06e479e57be7 Merge branch 'omap-for-v3.20/dt' into for-next)
Merging omap-pending/for-next (99d076b74745 MAINTAINERS: add maintainer for OMAP hwmod data)
Merging renesas/next (1cccbb29bf8a Merge branch 'heads/sh73a0-ccf-for-v3.20' into next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
Merging samsung/for-next (9663ad71912b Merge branch 'v3.20-next/update-samsung' into for-next)
Merging sunxi/sunxi/for-next (ca735dafe21d Merge branches 'sunxi/dt-for-3.20' and 'sunxi/core-for-3.20' into sunxi/for-next)
Merging tegra/for-next (4fd40ac71480 Merge branch for-3.20/soc into for-next)
Merging arm64/for-next/core (26a945caf381 arm64: remove broken cachepolicy code)
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD)
Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps)
Merging ia64/next (0fd2468fd035 Merge branch 'misc-3.19' into next)
Merging m68k/for-next (e69229f2eb9d m68k/atari: Remove obsolete keyboard_tasklet scheduling)
Merging m68knommu/for-next (8d84d4aaf311 arch: m68k: 68360: config: Remove unused function)
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
Merging microblaze/next (132d5dfc0469 microblaze: whitespace fix)
Merging mips/mips-for-linux-next (767db1014d10 Merge branch '3.19-fixes' into mips-for-linux-next)
Merging nios2/nios2-next (1b0f44923e18 nios2: Use preempt_schedule_irq)
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 (b2776bf7149b Linux 3.18)
Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible)
Merging powerpc-mpe/next (9a4fc4eaf111 powerpc/kvm: Create proper names for the kvm_host_state PMU fields)
Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver)
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (d97d929f06d0 s390: move cacheinfo sysfs to generic cacheinfo infrastructure)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (b9f705758a4f tile: enable sparse checks for get/put_user)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization)
Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function)
Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default)
CONFLICT (content): Merge conflict in net/ceph/auth_x.c
CONFLICT (content): Merge conflict in fs/ceph/super.h
CONFLICT (content): Merge conflict in fs/ceph/super.c
CONFLICT (content): Merge conflict in fs/ceph/snap.c
Merging cifs/for-next (cac8894b8ed7 cifs: use memzero_explicit to clear stack buffer)
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 (e7a823be2adc Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
Merging ext3/for_next (bbe48dd81147 udf: destroy sbi mutex in put_super)
Merging ext4/dev (4033d19d28ab ext4: add optimization for the lazytime mount option)
Merging f2fs/dev (3857cef8022d f2fs: update memory footprint information)
Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
CONFLICT (content): Merge conflict in fs/fscache/object.c
Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT)
Merging gfs2/master (3566c9647678 GFS2: fix sprintf format specifier)
Merging jfs/jfs-next (e1f1fe798d2f jfs: get rid of homegrown endianness helpers)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (4e379d36c050 NFSv4: Remove incorrect check in can_open_delegated())
Merging nfsd/nfsd-next (0ec016e3e02f nfsd4: tweak rd_dircount accounting)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree())
Merging xfs/for-next (ad7df6e858ef Merge branch 'xfs-sb-logging-rework' into for-next)
Merging file-locks/linux-next (ef187ab80371 locks: keep a count of locks on the flctx lists)
Merging vfs/for-next (88174fd2c8fb kill d_validate())
Merging pci/next (75f30c3d9949 Merge branches 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-rcar' and 'pci/host-tegra' into next)
Merging hid/for-next (88cbbe74e88b Merge branch 'for-3.20/wacom' into for-next)
Merging i2c/i2c/for-next (523c5b89640e i2c: Remove support for legacy PM)
Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro)
Merging hwmon-staging/hwmon-next (e4dcddb1b78c hwmon: (ina2xx) use DIV_ROUND_CLOSEST() to avoid rounding errors)
Merging v4l-dvb/master (2ea3258b238c Merge branch 'patchwork' into to_next)
Merging kbuild/for-next (5ea04a1a0860 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (8ce20e750623 Merge branch 'for-3.19-fixes' into for-next)
Merging pm/linux-next (794c3a0a9380 Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video')
Merging idle/next (f7c0e22f2d14 Merge branch 'turbostat' into release)
CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (f67744c4d91e Merge branch 'thermal-soc' of .git into next)
Merging thermal-soc/next (1813d8087469 thermal: rcar: Spelling/grammar: s/drier use .../driver uses ...s/)
Merging ieee1394/for-next (d737d7da8e7e firewire: sbp2: replace card lock by target lock)
Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
Merging slave-dma/next (1d49160e0f0f Merge branch 'topic/slave_caps_device_control_fix_rebased' into next)
Merging net-next/master (9a6b4b392de4 ipv6:icmp:remove unnecessary brackets)
CONFLICT (content): Merge conflict in drivers/net/xen-netfront.c
Merging ipsec-next/master (78890ed75494 csiostor:fix sparse warnings)
Merging wireless-drivers-next/master (350b193ebd50 Merge ath-next from ath.git)
Merging bluetooth/master (7b2ed60ed43a Bluetooth: 6lowpan: Remove PSM setting code)
Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next)
Merging mtd/master (97bf6af1f928 Linux 3.19-rc1)
Merging l2-mtd/master (7c272ac5eefb mtd: denali: fix incorrect bitmask error in denali_setup_dma)
Merging crypto/master (598de3695201 crypto: algif_rng - fix sparse non static symbol warning)
Merging drm/drm-next (426959c94553 drm: fix mismerge in drm_crtc.c)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c
Merging drm-panel/drm/panel/for-next (54cbc4e298ea drm/mipi-dsi: Avoid potential NULL pointer dereference)
Merging drm-intel/for-linux-next (cd52471999ef drm/i915: Fix kerneldoc for i915 atomic plane code)
Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory)
Merging drm-misc/topic/core-stuff (2535ef6ae303 next: drm/atomic: Use copy_from_user to copy 64 bit data from user space)
Merging sound/for-next (7b617289b699 ALSA: compress_driver.h: include sound/core.h explicitly)
Merging sound-asoc/for-next (e5ad1f85c387 Merge remote-tracking branch 'asoc/topic/xtfpga' into asoc-next)
Merging modules/modules-next (97bf6af1f928 Linux 3.19-rc1)
Merging virtio/virtio-next (97bf6af1f928 Linux 3.19-rc1)
Merging input/next (34412ba28232 Input: alps - add sanity checks for non DualPoint devices)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (87a1d9a82c53 Merge branch 'for-3.20/core' into for-next)
Merging device-mapper/for-next (6a55c9861326 block: keep established cmd_flags when cloning into a blk-mq request)
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 (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (09062c888b89 mmc: dw_mmc: Power on vqmmc in MMC_POWER_ON, not MMC_POWER_UP)
Merging kgdb/kgdb-next (c7d9ebf81c45 kdb: Fix off by one error in kdb_cpu())
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (f851b60db0fd md: Check MD_RECOVERY_RUNNING as well as ->sync_thread.)
Merging mfd/for-mfd-next (a3b63979f8a3 mfd: rtsx: Add func to split u32 into register)
Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem)
Merging battery/master (02088e3ed79f power: reset: augment versatile driver for integrator)
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 (574d54112fda Merge branches '3.19/omapdss' and '3.19/simplefb' into for-next)
Merging regulator/for-next (d81c617d61c9 Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next)
Merging security/next (b2d1965dcea1 Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next)
Merging integrity/next (63a0eb7891bd ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met)
Merging selinux/next (0307dadc924d selinux: add security in-core xattr support for pstore and debugfs)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (e0c3e00f4045 watchdog: drop owner assignment from platform_drivers)
Merging iommu/next (2c0ee8b85aae iommu/rockchip: Drop owner assignment from platform_drivers)
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU)
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
Merging jc_docs/docs-next (174236285cf8 Merge branch 'doc/sp-update' into docs-next)
Merging trivial/for-next (231821d4c3fa dynamic_debug: fix comment)
Merging audit/next (0f7e94ee40d0 Merge branch 'next' into upstream for v3.19)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (c46ca3c8310b of: Delete unnecessary check before calling "of_node_put()")
Merging dt-rh/for-next (e94fbe607f8c dt-bindings: use isil prefix for Intersil in vendor-prefixes.txt)
Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings)
Merging spi/for-next (3e4a88b1919b Merge remote-tracking branch 'spi/topic/st-ssc' into spi-next)
Merging tip/auto-latest (c1c82bd68fa5 Merge branch 'x86/platform')
Merging clockevents/clockevents/next (81428bbe1d8a clocksource: marco: Rename marco to atlas7)
Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks)
Merging edac-amd/for-next (a4972b1b9a04 edac: i5100_edac: Remove unused i5100_recmema_dm_buf_id)
Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (d716ff71dd12 tracing: Remove taking of trace_types_lock in pipe files)
Merging rcu/rcu/next (6e4d41d1e045 rcu_tree: Avoid touching rnp->completed when a new GP is started)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c)
Merging kvm-arm/next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c)
Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD)
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 (2e917175e1ef xen: Speed up set_phys_to_machine() by using read-only mappings)
Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying())
Merging workqueues/for-next (9da7dae94fb8 workqueue.h: remove loops of single statement macros)
Merging drivers-x86/for-next (200db647112d platform/x86/acerhdf: Still depends on THERMAL)
Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (270ded427d7b Merge remote-tracking branch 'regmap/topic/core' into regmap-next)
Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer)
Merging leds/for-next (452bc149947b leds: leds-mc13783: Use of_get_child_by_name() instead of refcount hack)
Merging ipmi/for-next (1421c935df15 ipmi: Fix compile warning with tv_usec)
Merging driver-core/driver-core-next (b7392d2247cf Linux 3.19-rc2)
Merging tty/tty-next (4c215fe8e288 vt: fix locking around vt_bind/vt_unbind)
Merging usb/usb-next (1d97869198a3 usb: host: drop owner assignment from platform_drivers)
Merging usb-gadget/next (487d60cc0923 usb: gadget: mv_udc_core: delete pullup operation at .udc_start)
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/bdc/bdc_ep.c
CONFLICT (content): Merge conflict in drivers/usb/dwc2/gadget.c
Merging usb-serial/usb-next (b7392d2247cf Linux 3.19-rc2)
Merging staging/staging-next (29d586247d21 staging: unisys: fix checkpatch space prohibited before comma errors)
Merging char-misc/char-misc-next (d885d4f3728f pcmcia: add missing include for new pci resource handler)
Merging cgroup/for-next (f3ba53802eff cgroup: add dummy css_put() for !CONFIG_CGROUPS)
Merging scsi/for-next (cbd5bdf0a2fd Merge branch 'misc' into for-next)
Merging target-updates/for-next (97bf6af1f928 Linux 3.19-rc1)
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 (c9ef73dccd6f Merge branch 'devel' into for-next)
Merging vhost/linux-next (0795cb1b46e7 sparc32: nocheck uaccess coding style tweaks)
Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (fa62e88f6295 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition)
Merging pwm/for-next (39e046f2c1dd pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling)
Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning)
Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests)
Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make)
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 (f1e9203e2366 clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL)
Merging kselftest/next (97bf6af1f928 Linux 3.19-rc1)
Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c)
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c
CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Merging luto-misc/next (d4812e169de4 x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks)
Merging access_once/linux-next (b5b64f62ed08 kernel: Fix sparse warning for ACCESS_ONCE)
Merging livepatching/for-next (99590ba565a2 livepatch: fix deferred module patching order)
Merging akpm-current/current (1d9e76e2eb3f fs/affs/file.c: replace if/BUG by BUG_ON)
CONFLICT (content): Merge conflict in mm/memory.c
CONFLICT (content): Merge conflict in drivers/misc/ti-st/st_core.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: dt-bindings: use isil prefix for Intersil
Applying: rtc: isl12022: deprecate use of isl in compatible string for isil
Applying: rtc: isl12057: deprecate use of isl in compatible string for isil
Applying: staging: iio: isl29028: deprecate use of isl in compatible string for isil
Applying: arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (463cb1a4011a mm: add strictlimit knob)

Attachment: pgpbNTpTZlYu_.pgp
Description: OpenPGP digital signature