Message-ID: <20150401192249.513e6282@canb.auug.org.au>
Date:	Wed, 1 Apr 2015 19:22:49 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	linux-next@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org
Subject: linux-next: Tree for Apr 1

Hi all,

Changes since 20150331:

The 13 trees hosted on git.infradead.org did not get updated today since
its git daemon was not responding.

New tree: at91

The idle tree lost its build failure.

Non-merge commits (relative to Linus' tree): 7543
 6834 files changed, 312022 insertions(+), 143735 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 213 trees (counting Linus' and 30 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@...b.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (6c310bc1acdd Merge tag 'locks-v4.0-5' of git://git.samba.org/jlayton/linux)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1)
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
Merging arm-current/fixes (8defb3367fcd ARM: 8320/1: fix integer overflow in ELF_ET_DYN_BASE)
Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1)
Merging powerpc-merge-mpe/fixes (44d5f6f5901e powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER)
Merging sparc/master (90a5a895cc8b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (347eec348a9b net/usb/r8152: add device id for Lenovo TP USB 3.0 Ethernet)
Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup())
Merging sound-current/for-linus (af95b41426e0 ALSA: hda - Add one more node in the EAPD supporting candidate list)
Merging pci-current/for-linus (bc3b5b47c80d PCI: cpcihp: Add missing curly braces in cpci_configure_slot())
Merging wireless-drivers/master (69628cd0652a Merge tag 'iwlwifi-for-kalle-2015-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging driver-core.current/driver-core-linus (bc465aa9d045 Linux 4.0-rc5)
Merging tty.current/tty-linus (8e4934c6d6c6 tty: serial: fsl_lpuart: clear receive flag on FIFO flush)
Merging usb.current/usb-linus (baf7a6c72668 Merge tag 'fixes-for-v4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
Merging usb-gadget-fixes/fixes (65582a7f4ce5 usb: isp1760: fix spin unlock in the error path of isp1760_udc_start)
Merging usb-serial-fixes/usb-linus (b229a0f840f7 USB: ftdi_sio: Use jtag quirk for SNAP Connect E10)
Merging staging.current/staging-linus (3d8bbe243dc7 Merge tag 'iio-fixes-for-4.0c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (bc465aa9d045 Linux 4.0-rc5)
Merging input-current/for-linus (33096777519a Input: define INPUT_PROP_ACCELEROMETER behavior)
Merging crypto-current/master (ccfe8c3f7e52 crypto: aesni - fix memory usage in GCM decryption)
Merging ide/master (b314acaccd7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging devicetree-current/devicetree/merge (41d9489319f2 drivers/of: Add empty ranges quirk for PA-Semi)
Merging rr-fixes/fixes (f47689345931 lguest: update help text.)
Merging vfio-fixes/for-linus (ec76f4007079 vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX)
Merging kselftest-fixes/fixes (67d8712dcc70 selftests: Fix build failures when invoked from kselftest target)
Merging drm-intel-fixes/for-linux-next-fixes (ee73c61c0af5 drm/i915: Skip allocating shadow batch for 0-length batches)
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 (18e1d1b115f7 arc: copy_thread(): rename 'arg' argument to 'kthread_arg')
Merging arm/for-next (3ebe15e18a14 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (82d31a990fa4 Merge branches 'perf/updates' and 'perf/cci' into for-next/perf)
Merging arm-soc/for-next (1e16d247349c Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/bus/Kconfig
Merging at91/at91-next (ed2ab8b57a4e Merge tag 'at91-dt2' into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging rpi/for-rpi-next (9a5a3543e168 ARM: bcm2835: Fix i2c0 node name)
Merging berlin/berlin/for-next (c517d838eb7d Linux 4.0-rc1)
Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
Merging imx-mxs/for-next (33e156f34c26 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next)
Merging mvebu/for-next (2afa4f248a76 Merge branch 'mvebu/fixes' into mvebu/for-next)
Merging omap/for-next (65457af22add Merge tag 'v4.1-soc' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging renesas/next (53a6e5250291 Merge branch 'heads/soc-cleanup-for-v4.1' into next)
Merging samsung/for-next (5d5443b9c3ba Merge branch 'v4.1-next/mach-samsung' into for-next)
Merging sunxi/sunxi/for-next (952934e18fef Merge branch 'sunxi/dt-for-4.1' into sunxi/for-next)
Merging tegra/for-next (66f0f096bd24 Merge branch for-4.1/dt into for-next)
Merging arm64/for-next/core (475bfd3d67fa arm64: defconfig: updates for 4.1)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging arm64-acpi/for-next/acpi (e441986ea317 ARM64 / ACPI: make acpi_map_gic_cpu_interface() as void function)
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback)
Merging cris/for-next (d939b52abe0c cris: fix integer overflow in ELF_ET_DYN_BASE)
Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps)
Merging ia64/next (62f269ef8191 pstore: Fix the ramoops module parameters update)
Merging m68k/for-next (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization)
Merging m68knommu/for-next (6e4206136faa m68knommu: fix fec setup warning for ColdFire 5271 builds)
Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg')
Merging microblaze/next (c2219eda5478 microblaze: Fix syscall error recovery for invalid syscall IDs)
Merging mips/mips-for-linux-next (f3ea2040ad04 Merge branches '4.1-fp' and '4.0-fixes' into mips-for-linux-next)
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/bus/Makefile
Merging nios2/nios2-next (6347e2a10f70 nios2: mm: do not invoke OOM killer on kernel fault OOM)
Merging parisc-hd/for-next (476840458128 parisc: Eliminate sg_virt_addr() and private scatterlist.h)
Merging powerpc/next (910681de70b7 Merge branch 'next-misc' into next)
Merging powerpc-mpe/next (4cd968ef4249 selftests/powerpc: Add a test of the switch_endian() syscall)
Merging fsl/next (0dc294f717d4 powerpc/mm: bail out early when flushing TLB page)
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (1a327ffd3d6a s390/syscalls: simplify syscall_get_arch())
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (0631818c4f64 arch: tile: fix null pointer dereference on pt_regs pointer)
Merging uml/linux-next (b98b91029cf8 hostfs: No need to box and later unbox the file mode)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (0372c1abdd0d Merge tag 'xtensa-for-next-20150304' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging btrfs/next (a742994aa2e2 Btrfs: don't remove extents and xattrs when logging new names)
Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default)
CONFLICT (content): Merge conflict in net/ceph/ceph_common.c
CONFLICT (content): Merge conflict in net/ceph/auth_x.c
CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h
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
CONFLICT (content): Merge conflict in fs/ceph/inode.c
Merging cifs/for-next (ff6b70456673 [CIFS] Fix warning)
Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through)
Merging ext3/for_next (5ce1aca81435 reiserfs: fix __RASSERT format string)
Merging ext4/dev (6f30b7e37a82 ext4: fix indirect punch hole corruption)
Merging f2fs/dev (fc655b4ed0a1 f2fs: fix sparse warnings)
Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
CONFLICT (content): Merge conflict in fs/fscache/object.c
Merging fuse/for-next (94e4fe2cab3d fuse: explicitly set /dev/fuse file's private_data)
Merging gfs2/for-next (7b4ddfa7c952 gfs2: incorrect check for debugfs returns)
Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers)
Merging nfs/linux-next (9eccca084320 Linux 4.0-rc3)
Merging nfsd/nfsd-next (1ec8c0c47f63 nfsd: Remove duplicate macro define for max sec label length)
Merging overlayfs/overlayfs-next (71cbad7e694e ovl: upper fs should not be R/O)
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (f569d3ef8254 net/9p: add a privport option for RDMA transport.)
Merging ubifs/linux-next (3527a86b7ae1 Merge tag 'v4.0-rc5' into linux-next)
Merging xfs/for-next (a448f8f1b744 Merge branch 'fallocate-insert-range' into for-next)
Merging file-locks/linux-next (15323f0c6a8d locks: use cmpxchg to assign i_flctx pointer)
Merging net-next/master (f6a69a8fd6c0 bonding: Fix another case of LACPDU not sent on slave)
CONFLICT (content): Merge conflict in net/ipv6/tcp_ipv6.c
CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c
CONFLICT (content): Merge conflict in include/linux/usb/usbnet.h
CONFLICT (content): Merge conflict in drivers/net/usb/usbnet.c
CONFLICT (content): Merge conflict in drivers/net/usb/sr9800.c
CONFLICT (content): Merge conflict in drivers/net/usb/asix_common.c
Applying: usbnet: fix bad merge in cdc_ncm.c
Merging vfs/for-next (8ec7e485327a Merge branch 'for-davem' into for-next)
CONFLICT (content): Merge conflict in fs/udf/file.c
Merging pci/next (8e795840e4d8 Merge branches 'pci/enumeration' and 'pci/virtualization' into next)
Merging hid/for-next (10dcaf31233a Merge branch 'for-4.1/upstream' into for-next)
Merging i2c/i2c/for-next (3b10db23c041 i2c: dln2: set the device tree node of the adapter)
Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6)
Merging hwmon-staging/hwmon-next (fcaf57b67dd0 hwmon: (ibmpowernv) do not use the OPAL index for hwmon attribute names)
Merging v4l-dvb/master (65ec78ae2f91 Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (4ee14ab5a132 Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (bfa76d495765 Linux 3.19)
Merging libata/for-next (e672f666d8b0 Merge branch 'for-4.1' into for-next)
Merging pm/linux-next (14a5fa0f140e Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (ec9b792ef33e Merge branches 'cpuidle' and 'turbostat' into release)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (c0c01971b43f Thermal: do thermal zone update after a cooling device registered)
Merging thermal-soc/next (65a7db8371d1 thermal: cpu_cooling: Check memory allocation of power_table)
CONFLICT (content): Merge conflict in include/linux/thermal.h
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
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 (739e9c81155e Merge branch 'fixes' into next)
CONFLICT (modify/delete): arch/arm/mach-shmobile/board-mackerel.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of arch/arm/mach-shmobile/board-mackerel.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-shmobile/board-ape6evm.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of arch/arm/mach-shmobile/board-ape6evm.c left in tree.
$ git rm -f arch/arm/mach-shmobile/board-mackerel.c arch/arm/mach-shmobile/board-ape6evm.c
Merging ipsec-next/master (74005991b78a xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host)
Merging wireless-drivers-next/master (9374e7d2fdca rtlwifi: rtl8192cu: Add new device ID)
Merging bluetooth/master (db6e3e8d0168 Bluetooth: Refactor HCI request variables into own struct)
Merging infiniband/for-next (147d1da951cf Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next)
Merging mtd/master (5e0899db69e2 mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA)
Merging l2-mtd/master (8cc7f33aadc8 mtd: spi-nor: factor out replace-able flash_{lock,unlock})
Merging crypto/master (555fa17b2b8c crypto: sha-mb - mark Multi buffer SHA1 helper cipher)
CONFLICT (content): Merge conflict in crypto/Kconfig
Applying: crypto: fix for sendmsg/recvmsg API change
Merging drm/drm-next (564b687b031c drm/bochs: disable video before changing video mode)
Merging drm-panel/drm/panel/for-next (94cfcae97787 drm/panel: Add display timing for HannStar HSD070PWW1)
Merging drm-intel/for-linux-next (fcec46ecd5f6 drm/i915: Set best_encoder field of connector_state also when disabling)
Merging drm-tegra/drm/tegra/for-next (13a7a6ac0a11 Linux 4.0-rc2)
Merging drm-misc/topic/drm-misc (066626d5d554 drm: line wrap DRM_IOCTL_DEF* macros)
Merging drm-exynos/exynos-drm/for-next (e7b30d56abc3 drm/exynos: fix the initialization order in FIMD)
Merging sound/for-next (4738465c3729 ALSA: hda/via - Add beep controls to VIA codecs)
Merging sound-asoc/for-next (43e45af35c61 Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next)
Merging modules/modules-next (cc9e605dc6cb module: do not print allocation-fail warning on bogus user buffer size)
Merging virtio/virtio-next (2f921b5bb051 lguest: suppress interrupts for single insn, not range.)
Merging input/next (bbdb38a22e8a Input: tsc2007 - Convert msecs to jiffies only once)
Merging block/for-next (ce29e701fae9 Merge branch 'for-4.1/core' into for-next)
Merging device-mapper/for-next (9cc26cb8cd3b dm: add log writes target)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (e03de74516ec mmc: omap_hsmmc: use generic slot-gpio isr to manage card detect pin)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (4bbe5e27f0c6 md/raid5: allow the stripe_cache to grow and shrink.)
Merging mfd/for-mfd-next (ba867bc60a44 mfd: twl6040: Remove wrong and unneeded "platform:twl6040" modalias)
Merging backlight/for-backlight-next (1926469377bb backlight: da9052_bl: Terminate da9052_wled_ids array with empty element)
Merging battery/master (7be5ac2c32bd power/reset: at91: big endian fixes for atsama5d3x)
CONFLICT (content): Merge conflict in drivers/hid/wacom_sys.c
CONFLICT (content): Merge conflict in drivers/hid/wacom.h
Applying: HID: wacom: merge fix for "Change ownership from driver to core"
Applying: HID: wacom: merge fix 2 for "Change ownership from driver to core"
Merging omap_dss2/for-next (72fc8b7187cd Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next)
Merging regulator/for-next (68a3ed946923 Merge remote-tracking branches 'regulator/topic/notifier', 'regulator/topic/palmas', 'regulator/topic/stw481x' and 'regulator/topic/wm8350' into regulator-next)
Merging security/next (1018bc268864 tpm/st33zp24/spi: Add missing device table for spi phy.)
CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c
Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory)
Merging selinux/next (9959049e4400 selinux: increase avtab max buckets)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (fe92a2e35727 watchdog: octeon: use fixed length string for register names)
Merging iommu/next (6a655ae8b7bd Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next)
Merging dwmw2-iommu/master (03ecc32c5274 iommu/vt-d: support extended root and context entries)
Merging vfio/next (71be3423a62b vfio: Split virqfd into a separate module for vfio bus drivers)
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
Merging jc_docs/docs-next (b1544e392e86 Documentation:Update Documentation/zh_CN/arm64/memory.txt)
Merging trivial/for-next (0e4f93e5017d goldfish: goldfish_tty_probe() is not using 'i' any more)
Merging audit/next (724e7bfcc566 audit: Remove condition which always evaluates to false)
Merging devicetree/devicetree/next (a2166ca5f320 Merge remote-tracking branch 'robh/for-next' into devicetree/next)
CONFLICT (rename/delete): Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt deleted in HEAD and renamed in devicetree/devicetree/next. Version devicetree/devicetree/next of Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt left in tree.
CONFLICT (rename/delete): Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt deleted in HEAD and renamed in devicetree/devicetree/next. Version devicetree/devicetree/next of Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt left in tree.
$ git rm -f Documentation/devicetree/bindings/mips/brcm/brcm,bcm3384-intc.txt Documentation/devicetree/bindings/mips/brcm/brcm,cm-dsl.txt
Merging dt-rh/for-next (01218bf14ee6 of: Explicitly include linux/types.h in of_graph.h)
Merging mailbox/mailbox-for-next (ee23d66af921 mailbox: arm_mhu: add driver for ARM MHU controller)
Merging spi/for-next (090ce5e0363a Merge remote-tracking branch 'spi/topic/spidev-test' into spi-next)
CONFLICT (modify/delete): drivers/dma/intel_mid_dma_regs.h deleted in spi/for-next and modified in HEAD. Version HEAD of drivers/dma/intel_mid_dma_regs.h left in tree.
CONFLICT (modify/delete): drivers/dma/intel_mid_dma.c deleted in spi/for-next and modified in HEAD. Version HEAD of drivers/dma/intel_mid_dma.c left in tree.
$ git rm -f drivers/dma/intel_mid_dma_regs.h drivers/dma/intel_mid_dma.c
Merging tip/auto-latest (8ec333a4b91f Merge branch 'x86/ras')
CONFLICT (content): Merge conflict in kernel/time/tick-internal.h
CONFLICT (content): Merge conflict in kernel/time/tick-common.c
CONFLICT (content): Merge conflict in kernel/time/tick-broadcast.c
CONFLICT (content): Merge conflict in include/linux/clockchips.h
CONFLICT (content): Merge conflict in arch/arm/common/bL_switcher.c
Applying: ARM: VDSO: rename tkr to tkr_mono
Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer)
CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig
Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks)
Merging edac-amd/for-next (1afaa0551521 EDAC: Constify of_device_id array)
Merging irqchip/irqchip/for-next (19392ad5ebab Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (e65e0516fb5f Merge branch 'for-next/ftrace/core' into trace/for-next)
Merging rcu/rcu/next (2484a8290184 rculist: Fix another sparse warning)
Merging kvm/linux-next (4ff6f8e61eb7 KVM: emulate: fix CMPXCHG8B on 32-bit hosts)
Merging kvm-arm/next (d44758c0dfc5 KVM: arm/arm64: enable KVM_CAP_IOEVENTFD)
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic.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 kvms390/next (816c7667ea97 KVM: s390: migrate vcpu interrupt state)
Merging xen-tip/linux-next (278edfc07875 xen-pciback: also support disabling of bus-mastering and memory-write-invalidate)
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying())
Merging workqueues/for-next (bffc4375897e percpu: Fix trivial typos in comments)
Merging drivers-x86/for-next (5d3fc1d54e5a toshiba_bluetooth: Fix enabling/disabling loop on recent devices)
Merging chrome-platform/for-next (8ce580932f8e platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST)
Merging regmap/for-next (5e83a0463ac0 Merge remote-tracking branch 'regmap/topic/trace' into regmap-next)
Merging hsi/for-next (f9c0d76eb47e HSI: nokia-modem: Add cmt-speech support)
Merging leds/for-next (ccdc45075aea leds: Don't treat the LED name as a format string)
Merging ipmi/for-next (3a31f945b709 ipmi: Remove incorrect use of seq_has_overflowed)
Merging driver-core/driver-core-next (fdc81b7910ad stable_kernel_rules: Add clause about specification of kernel versions to patch.)
Merging tty/tty-next (da29169e7692 serial: 8250_dw: fix 'cts-override')
Merging usb/usb-next (1c41a9570a02 Merge tag 'usb-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next)
Merging usb-gadget/next (3e457371f436 usb: musb: Fix fifo reads for dm816x with musb_dsps)
Merging usb-serial/usb-next (65dd82ae453f USB: f81232: fix some minor style issues)
Merging staging/staging-next (153fe946412b staging: fbtft: Do not use binary constants)
CONFLICT (content): Merge conflict in drivers/staging/media/mn88473/mn88473.c
Merging char-misc/char-misc-next (3a267d3b22f5 i8k: Remove use of seq_printf return value)
Merging extcon/extcon-next (66bee35f2968 extcon: Fix missing locking when [un]registering notifiers)
Merging kdbus/kdbus (1e951b699ad9 kdbus: Fix CONFIG_KDBUS help text)
CONFLICT (content): Merge conflict in Documentation/Makefile
Merging cgroup/for-next (34ebe933417e cpuset, isolcpus: document relationship between cpusets & isolcpus)
Merging scsi/for-next (4a44b7a98b7f Merge branch 'misc' into for-next)
Merging target-updates/for-next (377c757b7d86 iser-target: Bump version to 1.0)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging pinctrl/for-next (bef6ff0b15ef Merge branch 'devel' into for-next)
Merging vhost/linux-next (1179c21e8917 virtio_blk: fix comment for virtio 1.0)
Merging remoteproc/for-next (315491e5d6ee remoteproc: add IOMMU hardware capability flag)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (e03f967e2bd6 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (04abab698285 include/dma-mapping: Clarify output of dma_map_sg)
Merging pwm/for-next (71d54bfabb28 drivers/pwm: Remove __init initializer for pwm_add_table)
Merging dma-buf/for-next (56a4d3e2e2d4 staging: android: ion: fix wrong init of dma_buf_export_info)
Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests)
Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable)
Merging clk/clk-next (045ecad0fdb2 clk: samsung: exynos3250: Add driver for CMU_ISP clock domain)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
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 kselftest/next (8f3d7346435e selftests/mount: Make git ignore all binaries in mount test suite)
CONFLICT (content): Merge conflict in tools/testing/selftests/powerpc/Makefile
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5)
Merging livepatching/for-next (075b759be1bb Merge branch 'for-4.1/core-s390' into for-next)
CONFLICT (content): Merge conflict in arch/s390/Kconfig
Merging akpm-current/current (e38d2ff606af zsmalloc: remove extra cond_resched() in __zs_compact)
CONFLICT (content): Merge conflict in fs/fat/inode.c
CONFLICT (content): Merge conflict in arch/s390/mm/mmap.c
CONFLICT (content): Merge conflict in arch/parisc/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
CONFLICT (content): Merge conflict in Documentation/printk-formats.txt
$ git checkout -b akpm remotes/origin/akpm/master
Applying: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR
Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
Applying: mips: ip32: add platform data hooks to use DS1685 driver
Applying: oprofile: reduce mmap_sem hold for mm->exe_file
Applying: powerpc/oprofile: reduce mmap_sem hold for exe_file
Applying: oprofile-reduce-mmap_sem-hold-for-mm-exe_file-fix
Applying: tomoyo: reduce mmap_sem hold for mm->exe_file
Applying: tomoyo-reduce-mmap_sem-hold-for-mm-exe_file-checkpatch-fixes
Applying: MAINTAINERS: add Mediatek SoC mailing list
Applying: .gitignore: ignore *.tar
Applying: drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
Applying: rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2
Applying: Documentation/spi/spidev_test.c: fix warning
Applying: drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
Applying: mm, x86: document return values of mapping funcs
Applying: mtrr, x86: fix MTRR lookup to handle inclusive entry
Applying: mtrr, x86: remove a wrong address check in __mtrr_type_lookup()
Applying: mtrr, x86: fix MTRR state checks in mtrr_type_lookup()
Applying: mtrr, x86: define MTRR_TYPE_INVALID for mtrr_type_lookup()
Applying: mtrr, x86: clean up mtrr_type_lookup()
Applying: mtrr, mm, x86: enhance MTRR checks for KVA huge page mapping
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (c9ee1fa4cc38 mm: add strictlimit knob)

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists