Hi all, Changes since 20140728: The slave-dma tree lost its build failure. The modules tree still had its build failure so I used the version from next-20140725. The mmc-uh tree still had its build failure so I used the version from next-20140725. The tip tree still had its build failure, so I used the version from next-20140724. The irqchip tree gained a conflict against the arm-soc tree. The char-misc tree gained a conflict against the slave-dma tree. The gpio tree gained a conflict against the arm-soc tree and a build failure so I used the version from next-20140728. Non-merge commits (relative to Linus' tree): 8672 7685 files changed, 310949 insertions(+), 411214 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 224 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@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (31dab719fa50 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fixes/master (1795cd9b3a91 Linux 3.16-rc5) Merging kbuild-current/rc-fixes (dd5a6752ae7d firmware: Create directories for external firmware) Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) Merging arm-current/fixes (91942d17667a ARM: 8112/1: only select ARM_PATCH_PHYS_VIRT if MMU is enabled) Merging m68k-current/for-linus (5bc8c7cdeb6e m68k: Export mach_random_get_entropy to modules) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) Merging sparc/master (15ba2236f355 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (fe26566d8a05 bnx2x: fix crash during TSO tunneling) Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) Merging sound-current/for-linus (eb12f72ee724 ALSA: bebob: Correction for return value of special_clk_ctl_put() in error) Merging pci-current/for-linus (bf177a1eb6d1 MAINTAINERS: Update mx6 PCI driver maintainer's email) Merging wireless/master (c01fac1c77a0 ath9k: fix aggregation session lockup) Merging driver-core.current/driver-core-linus (9a3c4145af32 Linux 3.16-rc6) Merging tty.current/tty-linus (1795cd9b3a91 Linux 3.16-rc5) Merging usb.current/usb-linus (9a3c4145af32 Linux 3.16-rc6) Merging usb-gadget-fixes/fixes (a8a85b01d185 usb: musb/cppi41: call musb_ep_select() before accessing an endpoint's CSR) Merging usb-serial-fixes/usb-linus (1795cd9b3a91 Linux 3.16-rc5) Merging staging.current/staging-linus (4aa0abed3a2a staging: vt6655: Fix disassociated messages every 10 seconds) Merging char-misc.current/char-misc-linus (9a3c4145af32 Linux 3.16-rc6) Merging input-current/for-linus (f62d14a8072b Input: document INPUT_PROP_TOPBUTTONPAD) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (f3c400ef473e crypto: arm-aes - fix encryption of unaligned data) Merging ide/master (15ba2236f355 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 (356facff5275 of/platform: Fix of_platform_device_destroy iteration of devices) 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 (f4be89cecea4 drm/i915: Fix crash when failing to parse MIPI VBT) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (3a5d0df211dd mm, arc: remove obsolete pagefault oom killer comment) Merging arm/for-next (4aba888d74cc Merge branch 'devel-stable' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S Merging arm-perf/for-next/perf (4c834452aad0 Linux 3.16-rc3) Merging arm-soc/for-next (1c556ed805c5 arm-soc: document merges) CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/headsmp.S CONFLICT (modify/delete): arch/arm/mach-s5pv210/include/mach/memory.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/include/mach/memory.h left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S CONFLICT (modify/delete): arch/arm/mach-integrator/include/mach/memory.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-integrator/include/mach/memory.h left in tree. $ git rm -f arch/arm/mach-integrator/include/mach/memory.h arch/arm/mach-s5pv210/include/mach/memory.h Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) Merging berlin/berlin/for-next (251f72d06c59 Merge branch 'berlin/soc' 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 (69603fbbc479 ARM: dts: vf610: add FlexCAN node) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (f4cf18f4dedd Merge branch 'mvebu/dt' into mvebu/for-next) Merging renesas/next (8eec2c263543 Merge branch 'heads/shdma-for-v3.17' into next) Merging samsung/for-next (cef2cd22173c Merge remote-tracking branch 'tegra/for-3.17/dt-cros-ec-kbd' into for-next) Merging sunxi/sunxi/for-next (44b61dc11c6d Merge branch 'sunxi/dt-for-3.17' into sunxi/for-next) Merging tegra/for-next (9a3c4145af32 Linux 3.16-rc6) Merging arm64/for-next/core (72c583951526 arm64: gicv3: Allow GICv3 compilation with older binutils) Merging blackfin/for-linus (b76f98236a23 blackfin: vmlinux.lds.S: reserve 32 bytes space at the end of data section for XIP kernel) 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 (7c76bb5f7a3d RAS, extlog: Adjust init flow) Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed) Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize()) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (ef264cf0c490 microblaze: Change libgcc-style functions from lib-y to obj-y) Merging mips/mips-for-linux-next (de3d02f3906d Merge branch '3.16-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 (64aa90f26c06 Linux 3.16-rc7) Merging powerpc/next (ea668936b708 Add Michael Ellerman as powerpc co-maintainer) Merging fsl/next (cd1154770ba9 powerpc/85xx: drop hypervisor specific board compatibles) Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) Merging s390/features (26d766c60f4e s390/3215: fix hanging console issue) Merging sparc-next/master (cfcfe22256d5 Merge branch 'sparc64_io') Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata) 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 (4ed2ad38b3b4 Merge tag 'xtensa-for-next-20140715' of git://github.com/jcmvbkbc/linux-xtensa into for_next) Merging btrfs/next (c7548af69d9e Btrfs: convert smp_mb__{before,after}_clear_bit) Merging ceph/master (d1a5fb9fecd4 rbd: remove extra newlines from rbd_warn() messages) Merging cifs/for-next (bb7cd8d76356 [CIFS] Update cifs version) 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 (04ec5f5c0022 ecryptfs: remove unnecessary break after goto) Merging ext3/for_next (3f1be4f9c9dc udf: avoid redundant memcpy when writing data in ICB) Merging ext4/dev (6e2631463f3a ext4: fix incorrect locking in move_extent_per_page) Merging f2fs/dev (9d847950770d f2fs: fix to put root inode in error path of fill_super) Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) Merging gfs2/master (dec5ac00c840 GFS2: fs/gfs2/super.c: replace seq_printf by seq_puts) Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (e655f945cd7b Merge branch 'bugfixes' into linux-next) Merging nfsd/nfsd-next (3694328893ab nfsd: remove dl_fh field from struct nfs4_delegation) CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c 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 (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) Merging ubifs/linux-next (6390e991776e Revert "UBIFS: add a log overlap assertion") Merging xfs/for-next (a087481811be xfs: document log sysfs attributes in testing ABI) Merging file-private-locks/linux-next (73a8f5f7e635 locks: purge fl_owner_t from fs/locks.c) Merging vfs/for-next (cd67b9ac44ea switch iov_iter_get_pages() to passing maximal number of pages) Merging hch-vfs/vfs-for-3.17 (79a3a5cea657 cifs: support RENAME_NOREPLACE) Merging pci/next (981c191778a4 Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next) Merging hid/for-next (1d259fbdd1dc Merge branch 'for-3.17/cp2112' into for-next) Merging i2c/i2c/for-next (80e2f6405074 Merge branch 'i2c/for-current' into i2c/for-next) Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) Merging hwmon-staging/hwmon-next (f69b017bef03 hwmon: (pwm-fan) Make SENSORS_PWM_FAN depend on OF) Merging v4l-dvb/master (07178d53d61f Merge branch 'patchwork' into to_next) Merging kbuild/for-next (9a3127682612 Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (21ddb7d0c141 Merge branch 'for-3.16-fixes' into for-next) Merging pm/linux-next (dc4d5a77e0cd Merge branch 'pm-tools') CONFLICT (content): Merge conflict in drivers/acpi/acpi_extlog.c Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release) 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 (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next) Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) Merging slave-dma/next (db0e7018191e Merge commit 'renesas-rcar-audmapp-for-v3.17' into for-linus) Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) Merging net-next/master (ac3d2e5a9ef2 ipv6: remove obsolete comment in ip6_append_data()) CONFLICT (content): Merge conflict in net/mac80211/cfg.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/mvm/mac80211.c Applying: mac80211: fix for code movement Merging ipsec-next/master (1759389e8af4 xfrm4: Remove duplicate semicolon) Merging wireless-next/master (9a244409d0b0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless) Merging bluetooth/master (3bd2724010a5 Bluetooth: Fix incorrectly disabling page scan when toggling connectable) Merging infiniband/for-next (56c5333cfc84 Merge branches 'cxgb4' and 'mlx5' into for-next) Merging mtd/master (b6603fe574af Merge tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd) Merging l2-mtd/master (2a500afe1e0e mtd: gpmi: make blockmark swapping optional) Merging crypto/master (4839ddcaba26 crypto: ccp - Remove "select OF" from Kconfig) Merging drm/drm-next (e05444be705b drm/i915: fix initial fbdev setup warnings) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_render_state.c Merging drm-panel/drm/panel/for-next (ea44739db37f drm/panel: simple: add support for InnoLux N156BGE-L21 panel) Merging drm-intel/for-linux-next (98fcc935e2f2 work around warning in i915_gem_gtt) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c Merging drm-tegra/drm/tegra/for-next (9a9195228478 drm/tegra: dsi - Handle non-continuous clock flag) Merging sound/for-next (27c828816d74 ALSA: firewire: trivial typo fixes in Kconfig) Merging sound-asoc/for-next (88369726a141 Merge remote-tracking branches 'asoc/topic/wm8904' and 'asoc/topic/wm8985' into asoc-next) Merging modules/modules-next (2e3a10a1551d ARM: avoid ARM binutils leaking ELF local symbols) $ git reset --hard HEAD^ Merging next-20140725 version of modules Merging virtio/virtio-next (eeec626366ff Revert "hwrng: virtio - ensure reads happen after successful probe") Merging input/next (9d469d033d13 Input: atmel_mxt_ts - use deep sleep mode when stopped) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (a84352f82862 Merge branch 'for-3.17/core' into for-next) Merging device-mapper/for-next (2ca3856b413b dm crypt: sort writes) 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 (25f7dadbd982 mmc: dw_mmc: change to use recommended reset procedure) $ git reset --hard HEAD^ Merging next-20140725 version of mmc-uh Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (133d4527eab8 md: flush writes before starting a recovery.) 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 (30a2af3a320d mfd: arizona: Only free the CTRLIF_ERR IRQ if we requested it) Merging backlight/for-backlight-next (2188a988bb87 backlight: Add driver for iPAQ micro backlight) Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning) 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 (b1f46dd1079d video: clps711x: Fix sparse warnings) Merging regulator/for-next (154919b6cb25 Merge remote-tracking branches 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next) Merging security/next (f6fd5c84b9eb Merge tag 'fw-restrict-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next) Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation) CONFLICT (content): Merge conflict in include/linux/key.h Merging selinux/next (615e51fdda6f selinux: reduce the number of calls to synchronize_net() when flushing caches) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (64aa90f26c06 Linux 3.16-rc7) Merging iommu/next (d75c4ee4b06c Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/omap', 'ppc/pamu', 'arm/smmu' and 'core' into next) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (fd49c81f080a drivers/vfio/pci: Fix wrong MSI interrupt count) Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) Merging trivial/for-next (d31e373d0778 irq-gic: remove file name from heading comment) CONFLICT (content): Merge conflict in arch/arm/mach-msm/Kconfig CONFLICT (content): Merge conflict in Documentation/laptops/freefall.c Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface) CONFLICT (content): Merge conflict in kernel/audit.c CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/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 (2a0ef9bf3b1e Merge branch 'devicetree/next-overlay' into devicetree/next) Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root) Merging spi/for-next (8f76e224fd2e Merge remote-tracking branch 'spi/topic/topcliff-pch' into spi-next) Merging tip/auto-latest (6b06ce4828bd Merge branch 'x86/xsave') CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/hw.c $ git reset --hard HEAD^ Merging next-20140724 version of tip Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems) Merging edac-amd/for-next (eba4bfb34d45 EDAC, MCE, AMD: Add MCE decoding for F15h M60h) Merging irqchip/irqchip/for-next (c115d15552c0 Merge branch 'irqchip/atmel-aic' into irqchip/for-next) CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c CONFLICT (content): Merge conflict in arch/arm64/Kconfig CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/gic.txt Merging ftrace/for-next (6386b361ccf0 Merge branch 'trace/ftrace/core' into trace/for-next) Merging rcu/rcu/next (1c91efb24799 rcutorture: Specify CONFIG_CPUMASK_OFFSTACK=y for TREE07) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (b55a8144d180 x86/kvm: Resolve shadow warning from min macro) Merging kvm-arm/next (9f6226a762c7 arch: x86: kvm: x86.c: Cleaning up variable is set more than once) Merging kvm-ppc/kvm-ppc-next (1287cb3fa85c KVM: PPC: Book3S: Move vcore definition to end of kvm_arch struct) CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt 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 (28d4ce7322cf Merge branch 'devel/for-linus-3.17' into linux-next) Merging percpu/for-next (a46e532a9145 Merge branch 'for-3.16-fixes' into for-next) Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next) CONFLICT (content): Merge conflict in kernel/workqueue.c Merging drivers-x86/linux-next (f82bdd0d77b6 hp-wmi: Enable hotkeys on some systems) 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 (3059bfa09df6 Merge remote-tracking branches 'regmap/topic/getdev' and 'regmap/topic/getreg' into regmap-next) Merging hsi/for-next (0a0ea07d3dff HSI: ssi_protocol: Fix sparse non static symbol warning) Merging leds/for-next (4da498fc65de leds: add driver for the iPAQ micro) CONFLICT (add/add): Merge conflict in drivers/hid/hid-gt683r.c Merging driver-core/driver-core-next (0542ad88fbdd firmware loader: Fix _request_firmware_load() return val for fw load abort) CONFLICT (content): Merge conflict in drivers/gpu/drm/armada/armada_crtc.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r7s72100.c CONFLICT (modify/delete): arch/arm/mach-shmobile/board-genmai.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of arch/arm/mach-shmobile/board-genmai.c left in tree. $ git rm -f arch/arm/mach-shmobile/board-genmai.c Merging tty/tty-next (22524b02b17b Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console") Merging usb/usb-next (d508d992026c Merge tag 'for_3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next) CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c CONFLICT (content): Merge conflict in drivers/phy/phy-samsung-usb2.h CONFLICT (content): Merge conflict in drivers/phy/phy-samsung-usb2.c CONFLICT (content): Merge conflict in drivers/phy/Makefile CONFLICT (content): Merge conflict in drivers/phy/Kconfig CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/samsung-phy.txt Applying: phy: fix up for devm_phy_create api change Merging usb-gadget/next (8346b33fad01 Documentation: DocBook: elieminate doc build break) Merging usb-serial/usb-next (5bc9e5933a41 USB: kl5kusb105: Remove klsi_105_tiocmset function) Merging staging/staging-next (c22487b828ad staging: sep: remove driver) CONFLICT (modify/delete): drivers/staging/media/sn9c102/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/sn9c102/Kconfig left in tree. CONFLICT (modify/delete): drivers/staging/dgrp/dgrp_tty.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgrp/dgrp_tty.c left in tree. CONFLICT (modify/delete): drivers/staging/cxt1e1/linux.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/cxt1e1/linux.c left in tree. $ git rm -f drivers/staging/dgrp/dgrp_tty.c drivers/staging/cxt1e1/linux.c drivers/staging/media/sn9c102/Kconfig Merging char-misc/char-misc-next (16eb2bfc65ef Merge tag 'extcon-next-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) CONFLICT (content): Merge conflict in drivers/dma/Makefile CONFLICT (content): Merge conflict in drivers/Makefile CONFLICT (content): Merge conflict in drivers/Kconfig Merging cgroup/for-next (c6aa7f03a272 Merge branch 'for-3.17' into for-next) Merging scsi/for-next (cbf67842c3d9 scsi_debug: support scsi-mq, queues and locks) CONFLICT (content): Merge conflict in include/scsi/sg.h CONFLICT (content): Merge conflict in drivers/scsi/cxgbi/libcxgbi.h Merging scsi-core/core-for-3.16 (89fb4cd1f717 scsi: handle flush errors properly) Merging scsi-drivers/drivers-for-3.16 (8faeb529b2da virtio-scsi: fix various bad behavior on aborted requests) Merging target-updates/for-next (a497c3ba1d97 Linux 3.16-rc2) 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 (e1ee5c578fb1 pinctrl: baytrail: Convert to use gpiolib irqchip) Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) CONFLICT (content): Merge conflict in drivers/vhost/net.c Merging remoteproc/for-next (1803fe93b63b hwspinlock: enable OMAP build for AM33xx, AM43xx & DRA7xx) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (39b2bbe3d715 gpio: add flags argument to gpiod_get*() functions) CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.c $ git reset --hard HEAD^ Merging next-20140728 version of gpio Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target) Merging pwm/for-next (eae266a284f3 pwm: rockchip: document device tree bindings) Merging dma-buf/for-next (b23b35445ec8 Documentation: devres: Add devm_kmalloc() et al) 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 CONFLICT (content): Merge conflict in fs/btrfs/ioctl.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 (09575693a251 Merge branch 'clk-rockchip' into clk-next) Merging random/dev (b65797d576be random: limit the contribution of the hw rng to at most half) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in include/linux/syscalls.h CONFLICT (content): Merge conflict in drivers/char/hw_random/core.c CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_32.tbl Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging aio/master (00fefb9cf2b5 aio: use iovec array rather than the single one) Merging llvmlinux/for-next (f9da455b93f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) Merging rd-docs/master (1b1683691f03 I pointed some folks at this and they wondered why it wasn't in the kernel Documentation directory. So now it is.) Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) Merging akpm-current/current (76e148844001 fs/dlm/debug_fs.c: remove unnecessary null test before debugfs_remove) CONFLICT (content): Merge conflict in mm/shmem.c CONFLICT (content): Merge conflict in arch/arm64/Kconfig $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: init/main.c: code clean-up Applying: Update Roland McGrath's mail Applying: MAINTAINERS: remove two ancient EATA sections Applying: MAINTAINERS: update IBM ServeRAID RAID info Applying: arch/arm/mach-omap2: replace strict_strto* with kstrto* Applying: arch/arm/mach-pxa: replace strict_strto call with kstrto Applying: arch/arm/mach-s3c24xx/mach-jive.c: replace strict_strto* with kstrto* Applying: arch/arm/mach-w90x900/cpu.c: replace obsolete strict_strto Applying: arch/powerpc: replace obsolete strict_strto* calls Applying: arch/x86: replace strict_strto calls Applying: drivers/scsi: replace strict_strto calls Applying: include/linux: remove strict_strto* definitions Applying: pci-dma-compat: add pci_zalloc_consistent helper Applying: atm: use pci_zalloc_consistent Applying: block: use pci_zalloc_consistent Applying: crypto: use pci_zalloc_consistent Applying: infiniband: use pci_zalloc_consistent Applying: i810: use pci_zalloc_consistent Applying: media: use pci_zalloc_consistent Applying: amd: use pci_zalloc_consistent Applying: atl1e: use pci_zalloc_consistent Applying: enic: use pci_zalloc_consistent Applying: sky2: use pci_zalloc_consistent Applying: micrel: use pci_zalloc_consistent Applying: qlogic: use pci_zalloc_consistent Applying: irda: use pci_zalloc_consistent Applying: ipw2100: use pci_zalloc_consistent Applying: mwl8k: use pci_zalloc_consistent Applying: rtl818x: use pci_zalloc_consistent Applying: rtlwifi: use pci_zalloc_consistent Applying: scsi: use pci_zalloc_consistent Applying: staging: use pci_zalloc_consistent Applying: synclink_gt: use pci_zalloc_consistent Applying: vme: bridges: use pci_zalloc_consistent Applying: drivers/net/ethernet/amd/pcnet32.c: neaten and remove unnecessary OOM messages Applying: kernel/posix-timers.c: code clean-up Applying: kernel-posix-timersc-code-clean-up-checkpatch-fixes Applying: MAINTAINERS: update microcode patterns Applying: MAINTAINERS: update cifs location Applying: MAINTAINERS: use the correct efi-stub location Applying: MAINTAINERS: update clk/sirf patterns Applying: MAINTAINERS: fix ssbi pattern Applying: MAINTAINERS: use correct filename for sdhci-bcm-kona Applying: MAINTAINERS: fix PXA3xx NAND FLASH DRIVER pattern Applying: MAINTAINERS: update picoxcell patterns Applying: MAINTAINERS: remove section CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER Applying: MAINTAINERS: remove METAG imgdafs pattern Applying: MAINTAINERS: remove unused radeon drm pattern Applying: MAINTAINERS: remove unusd ARM/QUALCOMM MSM pattern Applying: MAINTAINERS: remove unused NFSD pattern Applying: bin2c: move bin2c in scripts/basic Applying: kernel: build bin2c based on config option CONFIG_BUILD_BIN2C Applying: kexec: rename unusebale_pages to unusable_pages Applying: kexec: move segment verification code in a separate function Applying: kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc() Applying: resource: provide new functions to walk through resources Applying: kexec: make kexec_segment user buffer pointer a union Applying: kexec: new syscall kexec_file_load() declaration Applying: kexec: implementation of new syscall kexec_file_load Applying: kexec-implementation-of-new-syscall-kexec_file_load-checkpatch-fixes Applying: kexec: return error if file bytes are less then file size Applying: purgatory/sha256: provide implementation of sha256 in purgaotory context Applying: purgatory: core purgatory functionality Applying: purgatory: run host built programs from objtree Applying: kexec: load and relocate purgatory at kernel load time Applying: kexec-load-and-relocate-purgatory-at-kernel-load-time-fix Applying: kexec-bzImage64: support for loading bzImage using 64bit entry Applying: kexec: fix freeing up for image loader data loading Applying: kexec: support for kexec on panic using new system call Applying: kexec-bzimage64: fix the ordering of registers Applying: kexec: support kexec/kdump on EFI systems Applying: kexec-support-kexec-kdump-on-efi-systems-fix Applying: fs.h: remove unnecessary extern prototypes Applying: fs.h: whitespace neatening Applying: fs.h: a few more whitespace neatenings Applying: fs.h: add argument names to struct file_lock_operations (*funcs) Applying: fs.h: add member argument descriptions to lock_manager_operations Applying: fs/dlm/plock.c: add argument descriptions to notify Applying: dlm, lockd: remove unused conf from lm_grant Applying: dlm: plock: reduce indentation by rearranging order Applying: fs: dlm/lockd: convert int result to unsigned char type Applying: kernel/kprobes.c: convert printk to pr_foo() Applying: mm: replace remap_file_pages() syscall with emulation Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix Applying: mm: remap_file_pages: initialize populate before usage Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping Applying: fat: add i_disksize to represent uninitialized size Applying: fat: add fat_fallocate operation Applying: fat: zero out seek range on _fat_get_block Applying: fat: fallback to buffered write in case of fallocated region on direct IO Applying: fat: permit to return phy block number by fibmap in fallocated region Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (22d4cd9a6367 mm: add strictlimit knob)
Attachment:
signature.asc
Description: PGP signature
