From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: Tree for Sep 30 Date: Tue, 30 Sep 2014 20:12:44 +1000 Message-ID: <20140930201244.0a4596ec@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/3b7oWnLYy40UnfXBRuGy+HB"; protocol="application/pgp-signature" Return-path: Received: from ozlabs.org ([103.22.144.67]:47834 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751332AbaI3KM4 (ORCPT ); Tue, 30 Sep 2014 06:12:56 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: linux-next@vger.kernel.org Cc: linux-kernel@vger.kernel.org --Sig_/3b7oWnLYy40UnfXBRuGy+HB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20140926: The arm-soc tree still had its build failure for which I reverted 5 commits. The asm-generic tree lost its build failure. The net-next tree gained conflicts against the net tree and a build failure so I used the version from next-20140926. The battery tree gained a conflict against the arm-soc tree. The watchdog tree lost its build failure. The tty tree gained a conflict against the slave-dma tree and a build failure so I used the version from next-20140926. The staging tree gained a build failure for which I reverted a commit. The scsi tree lost its build failure. The akpm tree gained a conflict against the clk tree and lost a few patches that turned up elsewhere. Non-merge commits (relative to Linus' tree): 8618 7372 files changed, 318777 insertions(+), 223023 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. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (fe82dcec6442 Linux 3.17-rc7) 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 (5ca918e5e3f9 ARM: 8165/1: alignment: don't break= misaligned NEON load/store) 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_secc= omp(), sys_getrandom() and sys_memfd_create()) Merging sparc/master (9d0713edf724 sparc64: Fix hibernation code refrence t= o PAGE_OFFSET.) Merging net/master (c5bb86c38481 net: stmmac: fix stmmac_pci_probe failed w= hen CONFIG_HAVE_CLK is selected) Merging ipsec/master (b8c203b2d2fc xfrm: Generate queueing routes only from= route lookup functions) Merging sound-current/for-linus (e76bf634870e ALSA: snd-usb-caiaq: Fix LED = commands for Kore controller) 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 f= or 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 X450L= CP touchpad detection) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" s= tripe) Merging crypto-current/master (7da4b29d496b crypto: aesni - disable "by8" A= VX 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 memor= y 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 fo= r-linus) Merging kselftest-fixes/fixes (ce6a144a0d01 selftests/memfd: Run test on al= l 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 (cc31d8f88795 Merge branches 'fiq' (early part), 'fixe= s' and 'misc' into for-next) Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1) Merging arm-soc/for-next (ba67b9ae55d5 Merge branch 'next/dt' into for-next) [master afc640ac092b] Revert "ARM: dts: hix5hd2: add gpio node" [master bed7bacb4885] Revert "ARM: dts: hix5hd2: add sata node" [master 930076afc0d3] Revert "ARM: dts: hix5hd2: add usb node" [master a7b2a9481700] Revert "ARM: dts: hix5hd2: add mmc node" [master 1fff9d2543f0] Revert "ARM: dts: hix5hd2: add gmac node" 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 suppo= rt) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' in= to ep93xx-for-next) Merging imx-mxs/for-next (2b2244a3e7c3 ARM: dts: imx6: make gpt per clock c= an 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_coheren= cy_flush exynos build breakage on ARMv6) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clo= ck/renesas,cpg-mstp-clocks.txt Merging sunxi/sunxi/for-next (429823087fec Merge branches 'sunxi/dt-for-3.1= 8' and 'sunxi/drivers-for-3.18' into sunxi/for-next) Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into f= or-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 unus= ed CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by c= ache.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 depen= d on TTY) Merging m68knommu/for-next (016371190da6 m68knommu: add missing ioport_map(= ) and ioport_unmap()) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (554336c714f4 microblaze: Use empty asm-generic/lin= kage.h) Merging mips/mips-for-linux-next (31d6f57d3c65 MIPS: ralink: remove depreca= ted IRQF_DISABLED) Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() sign= al_setup_done()) Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs p= arameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (0f33be009b89 Linux 3.17-rc6) Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hu= gepage invalidate) Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Pars= e device tree to setup idle states) Merging powerpc-mpe/next (be70ac29dadc powerpc: Enable DCACHE_WORD_ACCESS o= n ppc64le) Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints acr= oss different MSIRs") Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock spe= cs) Merging s390/features (242a112af62e s390/setup: correct 4-level kernel page= table detection) 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 primiti= ve) 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_CPUFRE= Q config option) Merging xtensa/for_next (f2589bff1ce8 xtensa/uapi: Add definition of TIOC[S= G]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 defa= ult (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 afte= r goto) Merging ext3/for_next (37993271cfa2 udf: remove redundant sys_tz declaratio= n) Merging ext4/dev (f6e63f908099 ext4: fold ext4_nojournal_sops into ext4_sop= s) Merging f2fs/dev (51bd1789ef78 f2fs: support atomic_write feature for datab= ase) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevec= s.) 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 (00a158be8383 GFS2: fix bad inode i_goal values during = block allocation) Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to ks= tr) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free = segment found) Merging nfs/linux-next (1716c22dd73c Merge branch 'bugfixes' into linux-nex= t) Merging nfsd/nfsd-next (4b1811d7f6ce nfsd4: fix corruption of NFSv4 read da= ta) 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 (849271a4e4b7 UBI: wl: Rename cancel flag to shutd= own) Merging xfs/for-next (bd438f825f7b Merge branch 'xfs-sparse-fixes' into for= -next) Merging file-locks/linux-next (c68f11db3d2f locks: fix fcntl_setlease/getle= ase 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_m= ount()) Merging pci/next (88736a07fd52 Merge branch 'pci/aer' into next) Merging hid/for-next (38807cbe3585 Merge branch 'for-3.18/sony' into for-ne= xt) Merging i2c/i2c/for-next (6c97c9c1acfc i2c: cros-ec-tunnel: Add of match ta= ble) Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) Merging hwmon-staging/hwmon-next (7ad8966f4f0a Merge tag 'mfd-hwmon-leds-wa= tchdog-v3.18' into hwmon-next) Merging v4l-dvb/master (fb83bb28a34d Merge branch 'v4l_for_linus' into to_n= ext with a regression fix) Merging kbuild/for-next (fc5cb19e16a7 Merge branch 'kbuild/misc' into kbuil= d/for-next) CONFLICT (content): Merge conflict in scripts/tags.sh Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends b= y default settings) Merging libata/for-next (3a9262e50dba Merge branch 'for-3.18' into for-next) Merging pm/linux-next (067c17382165 Merge branch 'pm-domains' into linux-ne= xt) 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 targ= et to the debug tools' makefiles) Merging thermal/next (dd634666793e Merge branches 'eduardo-soc' and 'bang-b= ang-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 sc= tp mode) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is inva= lid) Merging slave-dma/next (ade4a2a8e6e4 Merge branch 'for-linus' into next) Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_clea= nup() to mv_xor_slot_cleanup()) Merging net-next/master (79cf79abce71 macvlan: add source mode) 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 $ git reset --hard HEAD^ Merging next-20140926 version of net-next 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 [master 14af8c173cba] next-20140926/net-next Merging ipsec-next/master (689f1c9de2ab ipsec: Remove obsolete MAX_AH_AUTH_= LEN) Merging wireless-next/master (34ed780a6afc rtlwifi: Fix problems with build= ing an allyesconfig) Merging bluetooth/master (156395c9989a Bluetooth: 6lowpan: Enable multicast= support) 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_sd= r_timings doc) Merging l2-mtd/master (32f1b7c8352f mtd: move support for struct flash_plat= form_data into m25p80) Merging crypto/master (26c3af6c1580 crypto: qat - Removed unneeded partial = state) Merging drm/drm-next (d743ecf36063 drm/doc: Fixup drm_irq kerneldoc include= s.) Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1) Merging drm-intel/for-linux-next (67956867aa07 drm/i915: Don't spam dmesg w= ith rps messages on vlv/chv) Merging drm-tegra/drm/tegra/for-next (7d1311b93e58 Linux 3.17-rc1) Merging sound/for-next (7a7686bd0d15 ALSA: ctxfi: sparse warning) Merging sound-asoc/for-next (7c49fd9db59c Merge remote-tracking branches 'a= soc/topic/txx9', 'asoc/topic/wm8978' and 'asoc/topic/wm8994' into asoc-next) Merging modules/modules-next (184c3fc3f52f moduleparam: Resolve missing-fie= ld-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 platf= orm bus) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (0eb8b90c57f5 Merge branch 'for-3.18/core' into for-= next) Merging device-mapper/for-next (396d5fa8e65a dm crypt: sort writes) Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator p= recedence) Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware()= , v3) Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usa= ge) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and rem= ove 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 cle= an-up) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (b8cb6b4c121e md/raid1: fix_read_error should act on al= l non-faulty devices.) 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 bl= ank line after declarations) Merging battery/master (18a702e0de98 power: reset: use restart_notifier mec= hanism for msm-poweroff) 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 (30296f61159e video: fbdev: use %*ph specifier t= o dump small buffers) Merging regulator/for-next (8d15a6db88d9 Merge remote-tracking branches 're= gulator/topic/tps65217', 'regulator/topic/tps65910' and 'regulator/topic/vo= ltage-ev' into regulator-next) Merging security/next (35e1efd25a9e Merge tag 'keys-next-20140922' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs 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 file= s) 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 (9b936c960f22 drivers/vfio: Enable VFIO if EEH is not sup= ported) Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) Merging jc_docs/docs-next (5c050fb96380 docs: update the development proces= s 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 sysc= alls) 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 bin= dings) Merging spi/for-next (8ce240f1ae9f Merge remote-tracking branches 'spi/topi= c/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 HEA= D and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blockl= ayout/blocklayoutdm.c left in tree. CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdev.c deleted in HE= AD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/block= layout/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 mod= ified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-omap2/ir= q.c left in tree. $ git rm -f fs/nfs/blocklayout/blocklayoutdev.c fs/nfs/blocklayout/blocklay= outdm.c arch/arm/mach-omap2/irq.c Applying: pnfs: merge fixup for sched cleanup of set_current_state(TASK_RUN= NING) 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 base= d systems) Merging edac-amd/for-next (7981a28f1ab5 amd64_edac: Modify usage of amd64_r= ead_dct_pci_cfg()) Merging irqchip/irqchip/for-next (1633cd9aed67 Merge branch 'irqchip/gic' i= nto 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/x= 86-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' i= nto trace/for-next) Merging rcu/rcu/next (2bd9c72accaa rcu: Add sparse check for RCU_INIT_POINT= ER()) 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 u= nsupported fault types) Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_ge= t_last_inst) Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_wor= k) Merging xen-tip/linux-next (59119fad2954 xen-scsifront: don't deadlock if t= he 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 f= low in *_rfkill_notifier) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_la= ptop - 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 (a4c84e6aafda leds: gpio: cleanup the leds-gpio drive= r) Merging ipmi/for-next (662d15871626 ipmi: Clear drvdata when interface is r= emoved) Merging driver-core/driver-core-next (bef59c5024be devres: Improve devm_kas= printf()/kvasprintf() support) Merging tty/tty-next (0efe72963409 tty: serial: msm: Add earlycon support) CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_pci.c $ git reset --hard HEAD^ Merging next-20140926 version of tty 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: deque= ue cdev->req before free its buffer") Merging usb-serial/usb-next (f8c0e057b489 USB: serial: remove zte_ev driver) Merging staging/staging-next (76272ab3f348 staging: rtl8821ae: remove drive= r) [master 2dfca91db31b] Revert "staging: media: cxd2099: use usleep_range()" Merging char-misc/char-misc-next (ce23139c6c2e mei: fix kernel-doc warnings) Merging cgroup/for-next (55e8955e6eba Merge branch 'for-3.18' into for-next) Merging scsi/for-next (0d82860fca60 Merge remote-tracking branch 'scsi-queu= e/drivers-for-3.18' into for-next) Merging target-updates/for-next (c435285df112 target: fix unused shift in c= ore_scsi3_pri_report_capabilities) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corr= uption on NFS) Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS ent= ries) Merging pinctrl/for-next (d3d6f7a8ad05 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 (9a3c4145af32 Linux 3.16-rc6) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VI= RTIO) Merging gpio/for-next (8c3270e13eb1 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (b4bbb107d73b dma-mapping: Provide wri= te-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 kerneldo= c 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 BISE= CT_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 (6e18ff26c2b5 Merge tag 'hix5hd2-clock-for-3.18-v2' of= git://github.com/hisilicon/linux-hisi 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 (7d4cd0ef629a arm64: LLVMLinux: Fix inline arm64= assembly for use with clang) CONFLICT (content): Merge conflict in arch/arm/kernel/return_address.c CONFLICT (content): Merge conflict in Makefile Merging documentation/for-next (b2dd83b377d3 Documentation: correct paramet= er 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 wa= rning: `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: block: 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 hotplugga= ble Applying: mem-hotplug-fix-boot-failed-in-case-all-the-nodes-are-hotpluggabl= e-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 CONFLICT (content): Merge conflict in drivers/clk/rockchip/clk.h Applying: frv: remove unused declarations of __start___ex_table and __stop_= __ex_table Applying: ia64: remove duplicate declarations of __per_cpu_start[] and __pe= r_cpu_end[] Applying: kernel/param: consolidate __{start,stop}___param[] in Applying: mm: softdirty: enable write notifications on VMAs after VM_SOFTDI= RTY cleared Applying: mm-softdirty-enable-write-notifications-on-vmas-after-vm_softdirt= y-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 re= gion 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 (37eade1c62be mm: add strictlimit knob) --Sig_/3b7oWnLYy40UnfXBRuGy+HB Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUKoIjAAoJEMDTa8Ir7ZwVOkwP/jC18QSqjm8iQ5xzxGb4MnKy D8t4LEvI+hwv42vDVJkJwpB1UhOTrV2tzoLpvSs/LuhCGJy6VIXYPBTjbNIOtvOJ 3hvUE4dhCjldn3BZllv6M/LnqNKunaTIzWzQG3ix9HZ3hvRKGTqD+sW5lG7n6NNE jGAQL5RvecqGQKeXwERo/W2bkFwS923sjfsq3+/tfQRE7iKLFEDqHCkcz8Z4su1D v3a5zzsyf8wDEiZvz3gw0q8R9WfOfh03c+6OaC/A70JrZQFGYUpg9rgjBTeIsCtO Gb/8k+bfxopQDoh2Q7NnlL/m/4pwcFjpuwmif1Puh/FnBVyMHBrpXallbu4HfAxb kI6WNZeSEIyWBuFlBtSSh08jj9Bp9dLp02cLis9O4T7PMxC3kPa+zp4KoYZa0ueP RpJcddhXBNND4mssJQR2oNPqsoZVQBiWPEKOViB5SpTpXpxSREkUYO5cQ7BppfX+ UV8LW5gxrNTfH4HP0KbbK/7kZfCk7wYOZii4VSSauyqXAAnTURvJZOtxkvAi4BAs GrYX2nVagyrpNQDN5VO6ges5NTedejodk7wpbu0f6o+k2JQn+8gEFhHY/w0z/usq uYUob+pHPN3wZggOP95UY8oynQCFtF2TkcFUruf+bYllF5iVYKZvHhFnc1efwIjE SxXhr84DvS+Y97M2+jIV =cB3w -----END PGP SIGNATURE----- --Sig_/3b7oWnLYy40UnfXBRuGy+HB--