Hi all, Changes since 20141001: The arm-soc tree gained more build failures, so I used the version from next-20141001 with 5 commits reverted. The net-next tree lost its build failure but gained a conflict against the net tree. The crypto tree gained a conflict against the pci tree. The staging tree still had its build failure for which I reverted a commit. The target-updates tree gained a conflict against the scsi tree. Non-merge commits (relative to Linus' tree): 9076 7803 files changed, 360954 insertions(+), 268469 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 227 trees (counting Linus' and 32 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (a44f867247d5 Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (ad684dce87fa ARM: 8179/1: kprobes-test: Fix compile error "bad immediate value for offset") Merging m68k-current/for-linus (4ed7800987b1 m68k: Wire up memfd_create) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) Merging powerpc-merge-mpe/for-linus (7d59deb50aaf powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create()) Merging sparc/master (ca605b7dd740 sparc64: Add vio_set_intr() to enable/disable Rx interrupts) Merging net/master (0754476419f1 Merge branch 'r8152') Merging ipsec/master (b8c203b2d2fc xfrm: Generate queueing routes only from route lookup functions) Merging sound-current/for-linus (b7c2dc8e684a Merge tag 'asoc-v3.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (7cbeb9f90db8 PCI: pciehp: Fix pcie_wait_cmd() timeout) Merging wireless/master (f8adaf0ae978 brcmfmac: Fix off by one bug in brcmf_count_20mhz_channels()) Merging driver-core.current/driver-core-linus (9e82bf014195 Linux 3.17-rc5) Merging tty.current/tty-linus (9e82bf014195 Linux 3.17-rc5) Merging usb.current/usb-linus (0f33be009b89 Linux 3.17-rc6) Merging usb-gadget-fixes/fixes (0b93a4c838fa usb: dwc3: fix TRB completion when multiple TRBs are started) Merging usb-serial-fixes/usb-linus (dee80ad12d2b USB: cp210x: add support for Seluxit USB dongle) Merging staging.current/staging-linus (0f33be009b89 Linux 3.17-rc6) Merging char-misc.current/char-misc-linus (9e82bf014195 Linux 3.17-rc5) Merging input-current/for-linus (3049683eafdb Input: i8042 - fix Asus X450LCP touchpad detection) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (7da4b29d496b crypto: aesni - disable "by8" AVX CTR optimization) Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (9aacd602f024 of/fdt: fix memory range check) Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to remove the device) 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 kselftest-fixes/fixes (ce6a144a0d01 selftests/memfd: Run test on all architectures) Merging drm-intel-fixes/for-linux-next-fixes (91e56499304f drm/i915: Flush the PTEs after updating them before suspend) Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all boot code paths") Merging arc/for-next (517eefb5de44 ARC: unbork FPU save/restore) Merging arm/for-next (49e37117f8f6 Merge branches 'fiq' (early part), 'fixes' and 'misc' into for-next) Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1) Merging arm-soc/for-next (6f27222577f8 arm-soc: fixup mismerge) $ git reset --hard HEAD^ Merging next-20141001 version of arm-soc $ git am -3 ../patches/0001-Revert-ARM-dts-hix5hd2-add-gpio-node.patch Applying: Revert "ARM: dts: hix5hd2: add gpio node" [master 21cd808acb5f] next-20141001/arm-soc $ git am -3 ../patches/0002-Revert-ARM-dts-hix5hd2-add-sata-node.patch Applying: Revert "ARM: dts: hix5hd2: add sata node" [master 4861b7fe6d44] next-20141001/arm-soc $ git am -3 ../patches/0003-Revert-ARM-dts-hix5hd2-add-usb-node.patch Applying: Revert "ARM: dts: hix5hd2: add usb node" [master fde9354ad5b3] next-20141001/arm-soc $ git am -3 ../patches/0004-Revert-ARM-dts-hix5hd2-add-mmc-node.patch Applying: Revert "ARM: dts: hix5hd2: add mmc node" [master 8ce0f0b91728] next-20141001/arm-soc $ git am -3 ../patches/0005-Revert-ARM-dts-hix5hd2-add-gmac-node.patch Applying: Revert "ARM: dts: hix5hd2: add gmac node" [master a25d39518f1d] next-20141001/arm-soc Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) Merging berlin/berlin/for-next (8d4f3361e05c Merge branch 'berlin/dt' into berlin/for-next) Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (2b2244a3e7c3 ARM: dts: imx6: make gpt per clock can be from OSC) 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 (65a3bb88bb33 Merge branch 'mvebu/dt' into mvebu/for-next) Merging renesas/next (cc38f02b87ef Merge branches 'heads/dt-for-v3.18' and 'heads/soc-for-v3.18' into next) Merging samsung/for-next (a84aaa7556a5 ARM: cacheflush: Fix v7_exit_coherency_flush exynos build breakage on ARMv6) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt Merging sunxi/sunxi/for-next (429823087fec Merge branches 'sunxi/dt-for-3.18' and 'sunxi/drivers-for-3.18' into sunxi/for-next) Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next) Merging arm64/for-next/core (7acf71d1a224 arm64: Fix typos in KGDB macros) CONFLICT (content): Merge conflict in Documentation/networking/filter.txt Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) Merging ia64/next (0f33be009b89 Linux 3.17-rc6) Merging m68k/for-next (fd4d453b64d4 m68k: AMIGA_BUILTIN_SERIAL should depend on TTY) Merging m68knommu/for-next (e803d4bd3118 m68k: Fix typo 'COFNIG_MBAR') Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (554336c714f4 microblaze: Use empty asm-generic/linkage.h) Merging mips/mips-for-linux-next (31d6f57d3c65 MIPS: ralink: remove deprecated IRQF_DISABLED) 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 (3edfe0030bb7 parisc: Fix serial console for machines with serial port on superio chip) Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) Merging powerpc-mpe/next (2013add4ce73 powerpc/eeh: Show hex prefix for PE state sysfs) Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs") Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (cfb0b24143b4 s390/mm: make use of ipte range facility) Merging sparc-next/master (619df5d2870b Merge tag 'microblaze-3.17-rc5' of git://git.monstr.eu/linux-2.6-microblaze) Merging tile/master (9c29b2aea7fa tile gxio: use better string copy primitive) 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 (f2589bff1ce8 xtensa/uapi: Add definition of TIOC[SG]RS485) Merging btrfs/next (1d52c78afbbf Btrfs: try not to ENOSPC on log replay) Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len) Merging cifs/for-next (aad63e1c33dc Remap reserved posix characters by default (part 3/3)) 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 (c53f755d339b ocfs2: Back out change to use OCFS2_MAXQUOTAS in ocfs2_setattr()) Merging ext4/dev (f6e63f908099 ext4: fold ext4_nojournal_sops into ext4_sops) Merging f2fs/dev (539debb4a318 f2fs: support atomic_write feature for database) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) CONFLICT (content): Merge conflict in fs/fscache/object.c Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) Merging gfs2/master (19aeb5a65f1a GFS2: Make rename not save dirent location) 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 (b4b56796fe63 Merge branch 'client-4.2' into linux-next) Merging nfsd/nfsd-next (34549ab09e62 nfsd: eliminate "to_delegation" define) 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 (443b39cdd5c3 UBIFS: Fix trivial typo in power_cut_emulated()) Merging xfs/for-next (bd438f825f7b Merge branch 'xfs-sparse-fixes' into for-next) Merging file-locks/linux-next (c68f11db3d2f locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING) CONFLICT (content): Merge conflict in fs/locks.c Merging vfs/for-next (bb4623448d40 vfs: move getname() from callers to do_mount()) Merging pci/next (5b750d4fb905 Merge branch 'pci/host-xgene' into next) Merging hid/for-next (3fd9127d236c Merge branch 'for-3.18/uhid' into for-next) Merging i2c/i2c/for-next (6c97c9c1acfc i2c: cros-ec-tunnel: Add of match table) Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) Merging hwmon-staging/hwmon-next (7ad8966f4f0a Merge tag 'mfd-hwmon-leds-watchdog-v3.18' into hwmon-next) Merging v4l-dvb/master (fb83bb28a34d Merge branch 'v4l_for_linus' into to_next with a regression fix) Merging kbuild/for-next (758cd932b2d5 Merge branch 'kbuild/kbuild' into kbuild/for-next) CONFLICT (content): Merge conflict in scripts/tags.sh Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (3a9262e50dba Merge branch 'for-3.18' into for-next) Merging pm/linux-next (6f28c5c49468 Merge branch 'pm-devfreq' into linux-next) Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format) 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 (dd634666793e Merge branches 'eduardo-soc' and 'bang-bang-governor' 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 (ade4a2a8e6e4 Merge branch 'for-linus' into next) Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) Merging net-next/master (e500f488c276 net/dccp/ccid.c: add __init to ccid_activate) CONFLICT (content): Merge conflict in net/netfilter/nfnetlink.c CONFLICT (content): Merge conflict in drivers/net/usb/r8152.c CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3xxx.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188-radxarock.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/berlin2q-marvell-dmp.dts Merging ipsec-next/master (689f1c9de2ab ipsec: Remove obsolete MAX_AH_AUTH_LEN) Merging wireless-next/master (574a7930d7c4 rtlwifi: Fix randconfig build error with next-20140930) Merging bluetooth/master (6a57dba9f010 Bluetooth: btusb: remove redundant lock variable) Merging infiniband/for-next (3bdad2d13fa6 Merge branches 'core', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next) Merging mtd/master (b25046b1e5e3 mtd: nand: fix DocBook warnings on nand_sdr_timings doc) Merging l2-mtd/master (32f1b7c8352f mtd: move support for struct flash_platform_data into m25p80) Merging crypto/master (26c3af6c1580 crypto: qat - Removed unneeded partial state) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apm-storm.dtsi Merging drm/drm-next (7a42e83d36d2 Merge branch 'for-airlied-next' of git://people.freedesktop.org/~mlankhorst/linux into drm-next) Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1) Merging drm-intel/for-linux-next (ebb69c951756 drm/i915: Enable pixel replicated modes on BDW and HSW.) Merging drm-tegra/drm/tegra/for-next (7d1311b93e58 Linux 3.17-rc1) Merging sound/for-next (0cae90a96c15 ALSA: ctxfi: pr_* replaced with dev_*) Merging sound-asoc/for-next (7c49fd9db59c Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8978' and 'asoc/topic/wm8994' into asoc-next) Merging modules/modules-next (184c3fc3f52f moduleparam: Resolve missing-field-initializer warning) Merging virtio/virtio-next (7ec62d421bdf Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging input/next (042e1c79166b Input: soc_button_array - convert to platform bus) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (e9316e81a96b Merge branch 'for-3.18/drivers' into for-next) Merging device-mapper/for-next (2199f0608864 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 (6a98f1e83a28 mmc: Fix incorrect warning when setting 0 Hz via debugfs) Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (18bebd9a260f md/bitmap: remove bev_logical_block_size rounding where not needed.) Merging mfd/for-mfd-next (48b490d23ef5 MAINTAINERS: Adds Andreas Werner to maintainers list for MEN F21BMC) Merging backlight/for-backlight-next (b6af73b42219 backlight: omap1: add blank line after declarations) Merging battery/master (a7ba749e0146 Documentation: power: reset: Add documentation for generic SYSCON reboot driver) CONFLICT (content): Merge conflict in drivers/power/reset/Makefile CONFLICT (content): Merge conflict in drivers/power/reset/Kconfig 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 (2d6054564313 video/atmel_lcdfb: Introduce regulator support) Merging regulator/for-next (8d15a6db88d9 Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65910' and 'regulator/topic/voltage-ev' into regulator-next) Merging security/next (858f61c4298d Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next) CONFLICT (content): Merge conflict in security/smack/smack_lsm.c CONFLICT (content): Merge conflict in fs/nfsd/vfs.c Merging integrity/next (1b68bdf9cded ima: detect violations for mmaped files) Merging selinux/next (4093a8443941 selinux: normalize audit log formatting) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (76fc630c4ded Merge commit 'mfd-hwmon-leds-watchdog-v3.18') Merging iommu/next (4badea29d17e Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (0f905ce2b59c drivers/vfio: Export vfio_spapr_iommu_eeh_ioctl() with GPL) 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 (7bb38d57fd75 Remove MN10300_PROC_MN2WS0038) CONFLICT (content): Merge conflict in block/blk-core.c Merging audit/master (29075feaf1f5 next: openrisc: Fix build) CONFLICT (content): Merge conflict in arch/arm64/kernel/ptrace.c Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (a9ecdc0fdc54 of/irq: Fix lookup to use 'interrupts-extended' property first) Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea) Merging mailbox/mailbox-for-next (168e92ba5ec7 dt: mailbox: add generic bindings) Merging spi/for-next (8ce240f1ae9f Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/sirf' and 'spi/topic/xilinx' into spi-next) Merging tip/auto-latest (7fc22be52bdc Merge branch 'x86/vdso') CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdm.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blocklayout/blocklayoutdm.c left in tree. CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdev.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blocklayout/blocklayoutdev.c left in tree. CONFLICT (content): Merge conflict in arch/x86/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/x86/kernel/entry_64.S CONFLICT (modify/delete): arch/arm/mach-omap2/irq.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-omap2/irq.c left in tree. $ git rm -f fs/nfs/blocklayout/blocklayoutdev.c fs/nfs/blocklayout/blocklayoutdm.c arch/arm/mach-omap2/irq.c Applying: pnfs: merge fixup for sched cleanup of set_current_state(TASK_RUNNING) Applying: arm: omap: irq: fixup for new handle_domain_irq method 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 (a18c3f16a907 mpc85xx_edac: Make L2 interrupt shared too) Merging irqchip/irqchip/for-next (1633cd9aed67 Merge branch 'irqchip/gic' into irqchip/for-next) Merging tiny/tiny/next (d45461ff03ad Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next) CONFLICT (content): Merge conflict in arch/x86/boot/compressed/Makefile Merging ftrace/for-next (7cbfb5eed983 Merge branch 'trace/ftrace/testing' into trace/for-next) Merging rcu/rcu/next (2bd9c72accaa rcu: Add sparse check for RCU_INIT_POINTER()) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (cec26bc3c125 KVM: PPC: BOOK3S: HV: CMA: Reserve cma region only in hypervisor mode) Merging kvm-arm/next (0496daa5cf99 arm/arm64: KVM: Report correct FSC for unsupported fault types) Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst) 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 (59119fad2954 xen-scsifront: don't deadlock if the ring becomes full) Merging percpu/for-next (92f4f5286667 Merge branch 'for-3.18' into for-next) CONFLICT (content): Merge conflict in fs/ext4/super.c Applying: percpu_counter: fix for ext4 updates Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()) Merging drivers-x86/for-next (557b45497145 eeepc-laptop: clean up control flow in *_rfkill_notifier) 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 (dd2d4ed01960 Merge remote-tracking branch 'regmap/topic/cache' into regmap-next) Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()) Merging leds/for-next (200861223d3e led: remove use of gpiochip_remove() retval) Merging ipmi/for-next (662d15871626 ipmi: Clear drvdata when interface is removed) Merging driver-core/driver-core-next (bef59c5024be devres: Improve devm_kasprintf()/kvasprintf() support) Merging tty/tty-next (baeb7ef34952 tty: serial: 8250: use 32bit variable for rpm_tx_active) CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_pci.c Merging usb/usb-next (004332549522 usb: hcd: add generic PHY support) CONFLICT (content): Merge conflict in drivers/usb/gadget/function/f_fs.c Merging usb-gadget/next (72a65a0d19c1 Revert "usb: gadget: composite: dequeue cdev->req before free its buffer") Merging usb-serial/usb-next (f8c0e057b489 USB: serial: remove zte_ev driver) Merging staging/staging-next (f823182bc289 staging: r8192ee: Remove staging driver) $ git am -3 ../patches/0001-Revert-staging-media-cxd2099-use-usleep_range.patch Applying: Revert "staging: media: cxd2099: use usleep_range()" Merging char-misc/char-misc-next (480bd3c4ad30 mei: mei_txe_fw_sts can be static) Merging cgroup/for-next (55e8955e6eba Merge branch 'for-3.18' into for-next) Merging scsi/for-next (510dc0e4a3fc Merge branch 'fixes' into for-next) Merging target-updates/for-next (082f58ac4a48 target: Fix queue full status NULL pointer for SCF_TRANSPORT_TASK_SENSE) CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c 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 (8f1774a2a971 pinctrl: nomadik: improve GPIO debug prints) Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) CONFLICT (content): Merge conflict in drivers/vhost/net.c Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (afdadc06df68 gpio: staticize xway_stp_init()) CONFLICT (content): Merge conflict in drivers/pinctrl/qcom/pinctrl-msm.c CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.c Merging dma-mapping/dma-mapping-next (b4bbb107d73b dma-mapping: Provide write-combine allocations) Merging pwm/for-next (e2e08970100d pwm: atmel: Fix calculation of prescale value) Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry) CONFLICT (content): Merge conflict in fs/nfs/client.c Merging ktest/for-next (fee9d3e61d04 ktest: add ability to skip during BISECT_MANUAL) 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 (38bf3a79785f Merge branch 'clk-pxa27x' into clk-next) Merging random/dev (13aa93c70e71 random: add and use memzero_explicit() for clearing data) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging aio/master (668044a5d632 aio: Make it possible to remap aio ring) Merging llvmlinux/for-next (977104ece156 arm: LLVMLinux: Use global stack register variable for percpu) Merging documentation/for-next (b2dd83b377d3 Documentation: correct parameter error for dma_mapping_error) CONFLICT (content): Merge conflict in Documentation/networking/timestamping/Makefile Merging kselftest/next (69e273c0b0a3 Linux 3.17-rc3) Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) CONFLICT (content): Merge conflict in arch/unicore32/kernel/signal.c Merging akpm-current/current (77f1caf6149f scripts/sortextable: suppress warning: `relocs_size' may be used uninitialized) CONFLICT (content): Merge conflict in drivers/clk/Kconfig Applying: signal.h: using BUILD_BUG requires including bug.h $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: arch/x86/kernel/cpu/common.c: fix unused symbol warning Applying: lib/string.c: remove duplicated function Applying: lib: string: Make all calls to strnicmp into calls to strncasecmp Applying: ARM: replace strnicmp with strncasecmp Applying: netfilter: replace strnicmp with strncasecmp Applying: video: fbdev: replace strnicmp with strncasecmp Applying: cifs: replace strnicmp with strncasecmp Applying: ocfs2: replace strnicmp with strncasecmp Applying: isofs: replace strnicmp with strncasecmp Applying: batman-adv: replace strnicmp with strncasecmp Applying: scsi: replace strnicmp with strncasecmp Applying: ib_srpt: replace strnicmp with strncasecmp Applying: input: edt-ft5x06: replace strnicmp with strncasecmp Applying: altera-stapl: replace strnicmp with strncasecmp Applying: thinkpad_acpi: replace strnicmp with strncasecmp Applying: PNP: replace strnicmp with strncasecmp Applying: s390/cio: replace strnicmp with strncasecmp Applying: staging: r8188eu: replace strnicmp with strncasecmp Applying: thermal: replace strnicmp with strncasecmp Applying: kdb: replace strnicmp with strncasecmp Applying: fs: check bh blocknr earlier when searching lru Applying: arch/x86/mm/numa.c: fix boot failure when all nodes are hotpluggable Applying: mem-hotplug-fix-boot-failed-in-case-all-the-nodes-are-hotpluggable-checkpatch-fixes Applying: include/linux: remove strict_strto* definitions Applying: lib / string_helpers: move documentation to c-file Applying: lib / string_helpers: refactoring the test suite Applying: lib / string_helpers: introduce string_escape_mem() Applying: lib-string_helpers-introduce-string_escape_mem-fix Applying: lib/vsprintf: add %*pE[achnops] format specifier Applying: lib-vsprintf-add-%pe-format-specifier-fix Applying: wireless: libertas: print esaped string via %*pE Applying: wireless: ipw2x00: print SSID via %*pE Applying: wireless: hostap: proc: print properly escaped SSID Applying: wireless-hostap-proc-print-properly-escaped-ssid-fix Applying: wireless-hostap-proc-print-properly-escaped-ssid-fix-2 Applying: lib80211: remove unused print_ssid() Applying: staging: wlan-ng: use %*pEhp to print SN Applying: staging: rtl8192e: use %*pEn to escape buffer Applying: staging: rtl8192u: use %*pEn to escape buffer Applying: kernel/watchdog.c: control hard lockup detection default Applying: watchdog-control-hard-lockup-detection-default-fix Applying: watchdog, nmi: Fix compile issues on sparc Applying: kvm: ensure hard lockup detection is disabled by default Applying: watchdog: s3c2410: add restart handler Applying: clk: samsung: register restart handlers for s3c2412 and s3c2443 Applying: clk: rockchip: add restart handler Applying: frv: remove unused declarations of __start___ex_table and __stop___ex_table Applying: ia64: remove duplicate declarations of __per_cpu_start[] and __per_cpu_end[] Applying: kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h> Applying: mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared CONFLICT (content): Merge conflict in include/asm-generic/pgtable.h Applying: mm-softdirty-enable-write-notifications-on-vmas-after-vm_softdirty-cleared-fix Applying: fat: add i_disksize to represent uninitialized size Applying: fat: add fat_fallocate operation Applying: fat: skip cluster allocation on fallocated region 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: mm: replace remap_file_pages() syscall with emulation Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (4decd243e142 mm: add strictlimit knob)
Attachment:
signature.asc
Description: PGP signature
