Hi all, Changes since 20140717: The net-next tree gained a build failure so I used the version from next-20140717. The irqchip tree gained conflicts against the arm64 and trivial trees. The akpm-current tree gained a conflict against the random tree. Non-merge commits (relative to Linus' tree): 6591 6212 files changed, 241098 insertions(+), 337599 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 222 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 (59ca9ee42838 Merge tag 'stable/for-linus-3.16-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) 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 (6b076991dca9 ARM: DMA: ensure that old section mappings are flushed from the TLB) 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 (f56029410a13 powerpc/perf: Never program book3s PMCs with values >= 0x80000000) Merging sparc/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging net/master (c2a6c7813f1f net: huawei_cdc_ncm: add "subclass 3" devices) Merging ipsec/master (a0e5ef53aac8 xfrm: Fix installation of AH IPsec SAs) Merging sound-current/for-linus (4da63c6fc426 ALSA: hda - Fix broken PM due to incomplete i915 initialization) Merging pci-current/for-linus (8e809611be2e GenWQE: Use pci_enable_msi_range() so we can fall back to fewer MSIs) Merging wireless/master (2c4db12ec469 rt2800usb: Don't perform DMA from stack) Merging driver-core.current/driver-core-linus (aff008ad813c platform_get_irq: Revert to platform_get_resource if of_irq_get fails) Merging tty.current/tty-linus (1795cd9b3a91 Linux 3.16-rc5) Merging usb.current/usb-linus (bb86cf569bbd usb: Check if port status is equal to RxDetect) 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 (9359003385a2 Merge tag 'iio-fixes-for-3.16d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (1795cd9b3a91 Linux 3.16-rc5) Merging input-current/for-linus (31972f6e517d Input: ti_am335x_tsc - warn about incorrect spelling) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (e052dbf55461 hwrng: virtio - ensure reads happen after successful probe) Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) 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 (c6930992948a Revert "drm/i915: reverse dp link param selection, prefer fast over wide again") Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (4c834452aad0 Linux 3.16-rc3) Merging arm/for-next (92895a594212 Merge branch 'devel-stable' into for-next) Merging arm-perf/for-next/perf (4c834452aad0 Linux 3.16-rc3) Merging arm-soc/for-next (0b15a54c71d2 arm-soc: document merges) CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/headsmp.S 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 (64ef06b5e347 Merge branch 'imx/dt' into for-next) 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 (0ed00aa0e60b Merge branch 'mvebu/soc-cpuidle' into mvebu/for-next) CONFLICT (modify/delete): drivers/cpuidle/cpuidle-armada-370-xp.c deleted in mvebu/for-next and modified in HEAD. Version HEAD of drivers/cpuidle/cpuidle-armada-370-xp.c left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/headsmp-a9.S CONFLICT (content): Merge conflict in arch/arm/Kconfig $ git rm -f drivers/cpuidle/cpuidle-armada-370-xp.c Merging renesas/next (1b6ff88403ad Merge branches 'heads/clock-for-v3.17' and 'cleanup-boards-for-v3.17' into next) Merging samsung/for-next (cb588aed593a Merge branch 'v3.17-next/dt-samsung' into for-next) CONFLICT (modify/delete): arch/arm/plat-samsung/s5p-irq-eint.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/plat-samsung/s5p-irq-eint.c left in tree. CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-spi.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-spi.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-sdhci-gpio.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-sdhci-gpio.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-keypad.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-keypad.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-ide.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-ide.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-i2c2.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-i2c2.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-i2c1.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-i2c1.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-i2c0.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-i2c0.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-fimc.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-fimc.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/setup-fb-24bpp.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/setup-fb-24bpp.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/mach-smdkv210.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/mach-smdkv210.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/mach-goni.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/mach-goni.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/mach-aquila.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/mach-aquila.c left in tree. CONFLICT (rename/delete): arch/arm/mach-s5pv210/include/mach/gpio-samsung.h deleted in samsung/for-next and renamed in HEAD. Version HEAD of arch/arm/mach-s5pv210/include/mach/gpio-samsung.h left in tree. CONFLICT (modify/delete): arch/arm/mach-s5pv210/dev-audio.c deleted in samsung/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s5pv210/dev-audio.c left in tree. CONFLICT (content): Merge conflict in arch/arm/Kconfig $ git rm -f arch/arm/mach-s5pv210/dev-audio.c arch/arm/mach-s5pv210/include/mach/gpio-samsung.h arch/arm/mach-s5pv210/mach-aquila.c arch/arm/mach-s5pv210/mach-goni.c arch/arm/mach-s5pv210/mach-smdkv210.c arch/arm/mach-s5pv210/setup-fb-24bpp.c arch/arm/mach-s5pv210/setup-fimc.c arch/arm/mach-s5pv210/setup-i2c0.c arch/arm/mach-s5pv210/setup-i2c1.c arch/arm/mach-s5pv210/setup-i2c2.c arch/arm/mach-s5pv210/setup-ide.c arch/arm/mach-s5pv210/setup-keypad.c arch/arm/mach-s5pv210/setup-sdhci-gpio.c arch/arm/mach-s5pv210/setup-spi.c arch/arm/plat-samsung/s5p-irq-eint.c Merging sunxi/sunxi/for-next (c37f22f01a50 Merge branches 'sunxi/core-for-3.17', 'sunxi/dt-for-3.17' and 'sunxi/clocks-for-3.17' into sunxi/for-next) Merging tegra/for-next (c362210640fa Merge branch for-3.17/defconfig into for-next) Merging arm64/for-next/core (ad789ba5f708 arm64: Align the kbuild output for VDSOL and VDSOA) Merging blackfin/for-linus (19ba66d4c269 blackfin: fix some bf5xx boards build for missing <linux/gpio.h>) 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 (47d3aef76466 m68k/sun3: Remove define statement no longer needed) Merging m68knommu/for-next (9a1a1aea7572 m68knommu: Remove unnecessary prototype for kobjsize()) Merging metag/for-next (8bc613befaec metag: hugetlbpage: Remove null pointer checks that could never happen) Merging microblaze/next (08e6bbda0b48 microblaze: Wire-up renameat2 syscall) 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 (1860e379875d Linux 3.15) Merging powerpc/next (cd1154770ba9 powerpc/85xx: drop hypervisor specific board compatibles) 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 (50cf51f19faa s390/kdump: Return NOTIFY_OK for all actions other than MEM_GOING_OFFLINE) Merging sparc-next/master (894e552cfaa3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) 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 (437f2c0d0c01 rbd: fix ida/idr memory leak) 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 (14e4f8cecbc4 ext4: fix punch hole on files with indirect mapping) Merging f2fs/dev (4b2868aa4f07 f2fs: remove the unused stat_lock) Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) Merging fuse/for-next (f2b3455e47c7 fuse: replace count*size kzalloc by kcalloc) Merging gfs2/master (c04d5ee35ba6 GFS2: fs/gfs2/rgrp.c: kernel-doc warning fixes) 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 (547ca8b15b1b SUNRPC: xdr_get_next_encode_buffer should be declared static) 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 (44305ebde243 UBI: fastmap: do not miss bit-flips) 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 pci/next (792688fde431 Merge branches 'pci/host-generic', 'pci/host-mvebu', 'pci/host-rcar', 'pci/host-tegra', 'pci/msi', 'pci/misc', 'pci/resource' and 'pci/virtualization' into next) Merging hid/for-next (1d259fbdd1dc Merge branch 'for-3.17/cp2112' into for-next) Merging i2c/i2c/for-next (b299de839157 i2c: i801: Add device ID for Intel Wildcat Point PCH) Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) Merging hwmon-staging/hwmon-next (7785fea904f1 hwmon: (asc7621) Make map tables const) Merging v4l-dvb/master (5756894cd1fe Merge branch 'patchwork' into to_next) Merging kbuild/for-next (cf207dde8ee1 Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (480296e3453d Merge branch 'for-3.16-fixes' into for-next) Merging pm/linux-next (979565901d09 Merge branch 'pm-cpufreq' into linux-next) 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 (b6902baa1fab Merge branch 'for-rc' of .git into next) Merging ieee1394/for-next (655fc39bf403 firewire: IEEE 1394 (FireWire) support should depend on HAS_DMA) 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 (dd8ecfcac66b dmaengine: dw: don't perform DMA when dmaengine_submit is called) Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) Merging net-next/master (da388973d4a1 iw_cxgb4: fix for 64-bit integer division) $ git reset --hard HEAD^ Merging next-20140717 version of net-next Merging ipsec-next/master (1759389e8af4 xfrm4: Remove duplicate semicolon) Merging wireless-next/master (f95f59fe5d2b mwifiex: remove redundant TDLS setup action frame check and avoid leaks) Merging bluetooth/master (2f407f0afb44 Bluetooth: Fix allowing initiating pairing when not pairable) Merging infiniband/for-next (56c5333cfc84 Merge branches 'cxgb4' and 'mlx5' into for-next) CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/device.c Merging mtd/master (812c5fa82bae mtd: cfi_cmdset_0001.c: add support for Sharp LH28F640BF NOR) Merging l2-mtd/master (6534e6809e6c mtd: cfi_cmdset_0002: fix do_write_buffer() timeout error) Merging crypto/master (96956aef2ff5 crypto: drbg - drbg_exit() can be static) Merging drm/drm-next (62eb3e20f8f3 drm/tilcdc: Fix build breakage) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h Merging drm-panel/drm/panel/for-next (102932b0e474 drm/panel: add support for Foxlink FL500WVR00-A0T panel) Merging drm-intel/for-linux-next (d6fc55a2a089 drm/i915: Reorder ctx unref on ppgtt cleanup) Merging drm-tegra/drm/tegra/for-next (9a9195228478 drm/tegra: dsi - Handle non-continuous clock flag) Merging sound/for-next (2d9772ef653c ALSA: hda - Add NULL check to all PM ops in hda_intel.c) Merging sound-asoc/for-next (14376d2ecf59 Merge remote-tracking branches 'asoc/topic/wm8904' and 'asoc/topic/wm8985' into asoc-next) Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.) Merging virtio/virtio-next (c77fba9ab058 virtio_scsi: don't call virtqueue_add_sgs(... GFP_NOIO) holding spinlock.) Merging input/next (68807a0c2015 Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version) 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 (8b2b293dc003 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 (f25c33724d15 mmc: sdhci: add DDR50 1.8V mode support for BayTrail eMMC Controller) Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) Merging slab/for-next (201ed0edb712 Merge branch 'slab/next' into for-next) 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 (819b2dd1af7b mfd: arizona: Update DT binding to support MICVDD init_data) 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 (b1f46dd1079d video: clps711x: Fix sparse warnings) Merging regulator/for-next (1184f64dbef6 Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next) Merging security/next (32c2e6752ff0 ima: provide double buffering for hash calculation) Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation) 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 (7171511eaec5 Linux 3.16-rc1) 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/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 (c9e0fb3bb3aa tty: Update hypervisor tty drivers to use core stdout parsing code.) Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root) Merging spi/for-next (0f1bd07a82d3 Merge remote-tracking branch 'spi/topic/topcliff-pch' into spi-next) Merging tip/auto-latest (09ea0f7492ff Merge branch 'x86/xsave') Merging clockevents/clockevents/next (2529c3a33079 clocksource: Add Freescale FlexTimer Module (FTM) timer support) 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 (346d32307bab 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 Merging ftrace/for-next (f621b560eaa4 Merge branch 'trace/ftrace/core-2' into trace/for-next) Merging rcu/rcu/next (c6e2955266d1 rcu: Remove redundant checks for rcu_scheduler_fully_active) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (9f6226a762c7 arch: x86: kvm: x86.c: Cleaning up variable is set more than once) Merging kvm-arm/next (9f6226a762c7 arch: x86: kvm: x86.c: Cleaning up variable is set more than once) Merging kvm-ppc/kvm-ppc-next (c387936a9386 KVM: PPC: Book3S: Move vcore definition to end of kvm_arch struct) 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 (65f513aa75b1 xen/grant: Fix compile warnings) Merging percpu/for-next (a46e532a9145 Merge branch 'for-3.16-fixes' into for-next) Merging workqueues/for-next (8e8114ef248e 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 (1795cd9b3a91 Linux 3.16-rc5) Merging hsi/for-next (b74d4954ae6a drivers/hsi/controllers/omap_ssi{,_port}.c: fix failure checks) Merging leds/for-next (7e7743901b53 leds:pca963x: Update for PCA9635 and correct statement about MODE2 OUTDRV default) CONFLICT (add/add): Merge conflict in drivers/hid/hid-gt683r.c Merging driver-core/driver-core-next (954513551f5a staging: android: Cleanup style issues) Merging tty/tty-next (ca17749259d2 Merge 3.16-rc5 into tty-next.) Merging usb/usb-next (934ef5aca9da USB: serial: cp210x: Removing unncessary `usb_reset_device` on startup) Merging usb-gadget/next (8346b33fad01 Documentation: DocBook: elieminate doc build break) CONFLICT (content): Merge conflict in include/uapi/linux/usb/functionfs.h CONFLICT (content): Merge conflict in drivers/usb/musb/musb_host.c CONFLICT (content): Merge conflict in drivers/usb/musb/musb_cppi41.c CONFLICT (content): Merge conflict in drivers/usb/musb/musb_core.c Merging usb-serial/usb-next (5bc9e5933a41 USB: kl5kusb105: Remove klsi_105_tiocmset function) Merging staging/staging-next (f4ef08f0c109 Staging: gdm724x: gdm_tty.c: fix missing blank line after variable declaration) 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 (ce05b68692f0 dma: Fix MIC X100 DMA Driver Kconfig option) 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 (4944d7521bec pm8001: more fixes to honor return value) CONFLICT (content): Merge conflict in include/scsi/sg.h Merging scsi-core/core-for-3.16 (7bafc240e126 scsi: use the scsi data buffer length to extract transfer size) 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 (400f0cbd75df Merge branch 'devel' into for-next) Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) CONFLICT (content): Merge conflict in drivers/vhost/net.c 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 (b45d1c62672f Merge branch 'devel' into for-next) 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 (cdae1730d0c6 Merge branch 'clk-fixes' into clk-next) Merging random/dev (009815f01de0 random: limit the contribution of the hw rng to at most half) CONFLICT (content): Merge conflict in drivers/char/hw_random/core.c Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging aio/master (6e830d53717c Merge ../aio-fixes) 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 akpm-current/current (9f5b39070c6c fs/dlm/debug_fs.c: remove unnecessary null test before debugfs_remove) CONFLICT (content): Merge conflict in arch/x86/syscalls/syscall_64.tbl $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: init/main.c: code clean-up 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: 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 (675c7e4802e3 mm: add strictlimit knob)
Attachment:
signature.asc
Description: PGP signature
