From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751084AbaAXEkQ (ORCPT ); Thu, 23 Jan 2014 23:40:16 -0500 Received: from ozlabs.org ([203.10.76.45]:50010 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750769AbaAXEkL (ORCPT ); Thu, 23 Jan 2014 23:40:11 -0500 Date: Fri, 24 Jan 2014 15:40:02 +1100 From: Stephen Rothwell To: Cc: Subject: linux-next: Tree for Jan 24 Message-Id: <20140124154002.6020ae0892c30c82c77d7adf@canb.auug.org.au> X-Mailer: Sylpheed 3.4.0beta7 (GTK+ 2.24.22; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Fri__24_Jan_2014_15_40_02_+1100_CR=L9EBeRq5Kq375" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Fri__24_Jan_2014_15_40_02_+1100_CR=L9EBeRq5Kq375 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, There will be no tree on Monday (26/1) as it is a public holiday. Please do *not* add material destined for v3.15 to your linux-next included trees until after v3.14-rc1 is released. This tree fails (more than usual) the powerpc allyesconfig build. Changes since 20140123: Dropped trees: imx-mxs (complex merge conflicts against the arm tree) scsi (complex merge conflicts with Linus' tree) The powerpc tree still had its build failure. The staging tree gained a build failure for which I disabled a driver. The scsi tree gained conflict against the version of it merged into Linus' tree so I just dropped it for today. The init tree lost two of its patches. Non-merge commits (relative to Linus' tree): 6876 7279 files changed, 331484 insertions(+), 151447 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" as mentioned in the FAQ on the wiki (see below). 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 (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 208 trees (counting Linus' and 28 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. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (90804ed61f24 Merge branch 'for_linus' of git://git.k= ernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.k= ernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make insta= ll" not depend on vmlinux) Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8) Merging arm-current/fixes (b25f3e1c3584 ARM: 7938/1: OMAP4/highbank: Flush = L2 cache before disabling) Merging m68k-current/for-linus (56931d73697c m68k/mac: Make SCC reset work = more reliably) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (b3084f4db3ae powerpc/thp: Fix crash on mremap) Merging sparc/master (ef350bb7c5e0 Merge tag 'ext4_for_linus_stable' of git= ://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging net/master (7d0d46da750a Merge git://git.kernel.org/pub/scm/linux/k= ernel/git/davem/net) Merging ipsec/master (965cdea82569 dccp: catch failed request_module call i= n dccp_probe init) Merging sound-current/for-linus (2387083157b8 ALSA: hda - Apply +5dB output= amp on ASUS Zenbook UX31A) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.= MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (7d0d46da750a Merge git://git.kernel.org/pub/scm/li= nux/kernel/git/davem/net) Merging driver-core.current/driver-core-linus (90804ed61f24 Merge branch 'f= or_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging tty.current/tty-linus (413541dd66d5 Linux 3.13-rc5) Merging usb.current/usb-linus (90804ed61f24 Merge branch 'for_linus' of git= ://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging staging.current/staging-linus (413541dd66d5 Linux 3.13-rc5) Merging char-misc.current/char-misc-linus (90804ed61f24 Merge branch 'for_l= inus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging input-current/for-linus (55df811f2066 Merge branch 'next' into for-= linus) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" s= tripe) Merging crypto-current/master (79ba451d66ca crypto: aesni - fix build on x8= 6 (32bit)) Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvd= ata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dere= ference in unflatten_and_copy()) Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter k= ernel symbols for arm) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts be= fore 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 fo= r-linus) Merging drm-intel-fixes/for-linux-next-fixes (09f2344d0896 drm/i915/bdw: ma= ke sure south port interrupts are enabled properly v2) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for = nommu) Merging arc/for-next (e57d339a6264 ARC: [cmdline] support External Device T= rees from u-boot) Merging arm/for-next (360f4eb1c1fb Merge branch 'cubox-i-init' into for-nex= t) Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1) Merging arm-soc/for-next (8efb23e6eb2b Merge branch 'next/boards' into for-= next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/bcm11351.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-370-xp.dtsi CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug Merging bcm2835/for-next (413541dd66d5 Linux 3.13-rc5) Merging cortex-m/for-next (f41bfc9423aa Merge tag 'ext4_for_linus' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' in= to ep93xx-for-next) Merging imx-mxs/for-next (211028099575 Merge branch 'imx/dt' into for-next) CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/imx6qdl-microsom.dt= si CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/imx6qdl-microsom-ar= 8035.dtsi CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/imx6dl-hummingboard= .dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile $ git merge --abort Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have= standard 'qcom' prefix) Merging mvebu/for-next (a76f86614bab Merge branch 'mvebu/dt' into for-next) Merging renesas/next (88c499f14016 Merge branch 'heads/dt-fixes' into next) Merging samsung/for-next (8109c477487a Merge branch 'v3.14-next/dt-exynos-3= ' into for-next) Merging tegra/for-next (95e770a5ad96 Merge branch for-3.14/defconfig into f= or-next) Merging arm64/for-next/core (883c05736701 arm64: fix typo in entry.S) Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for un= used variable) Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by c= ache.h) Merging cris/for-next (e269a869417c Drop code for CRISv10 CPU simulator) Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent refer= ence to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) Merging ia64/next (d52eefb47d4e ia64/xen: Remove Xen support for ia64) Merging m68k/for-next (56931d73697c m68k/mac: Make SCC reset work more reli= ably) Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS) Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() stati= c) Merging microblaze/next (a23e64af1a9b microblaze: Simplify fcpu helper func= tion) Merging mips/mips-for-linux-next (2310c14cdd10 mips: select ARCH_MIGHT_HAVE= _PC_SERIO) CONFLICT (content): Merge conflict in arch/mips/netlogic/xlp/setup.c CONFLICT (content): Merge conflict in arch/mips/Kconfig 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 (7d1c153ab373 Merge branch 'parisc-3.13' of git:= //git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) Merging powerpc/next (fac515db4520 Merge remote-tracking branch 'scott/next= ' into next) Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock spe= cs) Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pc= i bridge device node for T4/B4) Merging s390/features (fded4329da9e s390: wire up sys_sched_setattr/sys_sch= ed_getattr) Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://pe= ople.freedesktop.org/~airlied/linux) Merging tile/master (5e01dc7b26d9 Linux 3.12) Merging uml/next (989e59fa41c5 um: Include generic barrier.h) Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXP= ERIMENTAL) Merging xtensa/for_next (9ed82c6866e2 xtensa: implement ndelay) CONFLICT (content): Merge conflict in arch/xtensa/include/asm/barrier.h CONFLICT (content): Merge conflict in arch/xtensa/Kconfig Merging btrfs/next (56817eda3c10 Btrfs: introduce the delayed inode ref del= etion for the single link inode) Merging ceph/master (8eb4efb091c8 ceph: implement readv/preadv for sync ope= ration) Merging cifs/for-next (d81b8a40e2ec CIFS: Cleanup cifs open codepath) 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 (9e78d14a9f64 Use %pd in eCryptFS) Merging ext3/for_next (4ea7772f828a udf: Fix lockdep warning from udf_symli= nk()) Merging ext4/dev (353aeefe7f86 ext4: delete "set but not used" variables) Merging f2fs/dev (bf39c00a9a7f f2fs: drop obsolete node page when it is tru= ncated) Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt = to store a page that is now beyond EOF) Merging fuse/for-next (c6f459d25c02 fuse: Turn writeback cache on) Merging gfs2/master (d57b9c9a999a GFS2: revert "GFS2: d_splice_alias() can'= t return error") Merging jfs/jfs-next (0439e091e3b1 jfs: fix xattr value size overflow in __= jfs_setxattr) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free = segment found) Merging nfs/linux-next (ed7e5423014a pnfs: Proper delay for NFS4ERR_RECALLC= ONFLICT in layout_get_done) Merging nfsd/nfsd-next (068c34c0ce8a nfsd: fix encode_entryplus_baggage sta= ck usage) 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 (fb89b45cdfdc 9P: introduction of a new cache=3Dmmap = model.) Merging ubifs/linux-next (c23e9b75ccd0 UBIFS: remove invalid warn msg with = tst_recovery enabled) Merging xfs/for-next (bf3964c188d6 Merge branch 'xfs-extent-list-locking-fi= xes' into for-next) Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribut= e modification) Merging pci/next (cef09b808e58 Merge branch 'eisa' into next) Merging hid/for-next (fd7e37af337b Merge branch 'for-3.14/sony' into for-ne= xt) Merging i2c/i2c/for-next (03d11a0e458d Merge tag 'for-v3.14' of git://git.i= nfradead.org/battery-2.6) Merging jdelvare-hwmon/master (68d5516b35c7 hwmon: (it87) Print proper name= s for the IT8771E and IT8772E) Merging hwmon-staging/hwmon-next (d303b1b5fbb6 hwmon: (k10temp) Add support= for Kaveri CPUs) Merging v4l-dvb/master (e26d710a8cdf Merge branch 'patchwork' into to_next) CONFLICT (content): Merge conflict in drivers/staging/media/go7007/go7007-u= sb.c Merging kbuild/for-next (ddbfd0b07555 Merge branch 'kbuild/kbuild' into kbu= ild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends b= y default settings) Merging libata/for-next (f939ad10650c Merge branch 'for-3.14' into for-next) Merging pm/linux-next (dd5292446578 Merge branch 'fixes' into linux-next) CONFLICT (content): Merge conflict in drivers/char/tpm/tpm_ppi.c CONFLICT (content): Merge conflict in drivers/acpi/processor_idle.c CONFLICT (content): Merge conflict in drivers/acpi/apei/einj.c CONFLICT (content): Merge conflict in drivers/acpi/acpi_extlog.c Merging idle/next (5c56be9a25ba turbostat: Add option to report joules cons= umed per sample) Merging apm/for-next (158204397034 apm-emulation: add hibernation APM event= s to support suspend2disk) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install targ= et to the debug tools' makefiles) Merging thermal/next (c698a4492f01 Merge branch 'misc' of .git into next) CONFLICT (content): Merge conflict in drivers/cpufreq/Kconfig Merging ieee1394/for-next (fcd46b34425d firewire: Enable remote DMA above 4= GB) Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket) Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotl= b buffer is full' (v2)) Merging slave-dma/next (f241c35ebc31 Merge branch 'for-linus' into next) CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c Merging dmaengine/next (77873803363c net_dma: mark broken) Merging net-next/master (d0bc65557ad0 net/vxlan: Share RX skb de-marking an= d checksum checks with ovs) CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/mips/bcm47xx/setup.c Merging ipsec-next/master (abfce3ef58b6 sctp: remove the unnecessary assign= ment) Merging wireless-next/master (a64e1a45060f ath9k: Fix RX interrupt mitigati= on) Merging bluetooth/master (65d303c9bacc Bluetooth: Remove useless l2cap_seq_= list_remove function) Applying: net: 6lowpan: fixup for code movement Merging infiniband/for-next (fb1b5034e498 Merge branch 'ip-roce' into for-n= ext) CONFLICT (content): Merge conflict in include/linux/mlx4/device.h Merging mtd/master (802eee95bde7 Linux 3.13-rc6) Merging l2-mtd/master (02d018625b78 mtd: s3c2410: Merge plat/regs-nand.h in= to s3c2410.c) Merging crypto/master (79ba451d66ca crypto: aesni - fix build on x86 (32bit= )) Merging drm/drm-next (76f4f415e502 Merge branch 'drm-nouveau-next' of git:/= /anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next) Merging drm-intel/for-linux-next (232a6ee9af8a drm/i915: VLV2 - Fix hotplug= detect bits) Merging drm-tegra/drm/for-next (13411ddd3190 drm/tegra: Obtain head number = from DT) Merging sound/for-next (2387083157b8 ALSA: hda - Apply +5dB output amp on A= SUS Zenbook UX31A) Merging sound-asoc/for-next (70add23b5039 Merge remote-tracking branch 'aso= c/fix/wm5100' into asoc-linus) Merging modules/modules-next (22e669568d51 module: Add missing newline in p= rintk call.) Merging virtio/virtio-next (05c54de8c88c drivers: virtio: Mark function vir= tballoon_migratepage() as static in virtio_balloon.c) Merging input/next (497ab1f290a2 Input: wacom - add support for DTU-1031) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging cgroup/for-next (f446b64bccab Merge branch 'for-3.14' into for-next) Merging block/for-next (c0f80832454e Merge branch 'for-3.14/drivers' into f= or-next) CONFLICT (content): Merge conflict in include/trace/events/f2fs.h CONFLICT (content): Merge conflict in fs/f2fs/segment.c CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in drivers/md/raid10.c CONFLICT (content): Merge conflict in drivers/md/raid1.c CONFLICT (content): Merge conflict in drivers/md/dm-thin.c Merging device-mapper/for-next (5066a4df1f42 dm log userspace: allow mark r= equests to piggyback on flush requests) 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 (945be38caa28 mmc: sdhci-pci: Fix possibility of chip-= >fixes being null) CONFLICT (content): Merge conflict in MAINTAINERS Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) CONFLICT (content): Merge conflict in kernel/debug/debug_core.h Merging slab/for-next (26e4f2057516 slub: Fix possible format string bug.) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (7da9d450ab28 md/raid5: close recently introduced race = in stripe_head management.) Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.li= naro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (02915661dbb9 mfd: wm5110: Add register patch f= or rev D chip) Merging battery/master (573189354b7c MAINTAINERS: Pick up power supply main= tainership) 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 (cb1fbad7ec25 Merge branches '3.14/fbdev', '3.14= /dss-misc' and '3.14/dss-fclk' into for-next) Merging regulator/for-next (15b0698c882f Merge tag 'regulator-v3.14-2' into= regulator-next) Merging security/next (923b49ff69fc Merge branch 'master' of git://git.infr= adead.org/users/pcmoore/selinux into next) Merging selinux/next (41be702a542a Merge tag 'v3.13' into next) Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kerne= l.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (cb58a2067044 watchdog: sp805_wdt depends also on A= RM64) CONFLICT (content): Merge conflict in arch/arm/configs/bcm_defconfig Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of= git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu) Merging iommu/next (dd1a175695ed Merge branches 'arm/smmu', 'core', 'x86/vt= -d', 'arm/shmobile', 'x86/amd', 'ppc/pamu', 'iommu/fixes' and 'arm/msm' int= o next) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Kconfig Merging vfio/next (3be3a074cf5b vfio-pci: Don't use device_lock around AER = interrupt setup) Merging osd/linux-next (19350e7627a6 exofs: Print less in r4w) Merging jc_docs/docs-next (5c050fb96380 docs: update the development proces= s document) Merging trivial/for-next (c04e7da0133f neighbour.h: fix comment) Merging audit/master (f3411cb2b2e3 audit: whitespace fix in kernel-paramete= rs.txt) CONFLICT (content): Merge conflict in include/net/xfrm.h Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart sysc= alls) Merging devicetree/devicetree/next (2a9330010bea dt/bindings: submitting pa= tches and ABI documents) CONFLICT (content): Merge conflict in arch/arm/boot/dts/orion5x-lacie-ether= net-disk-mini-v2.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/kirkwood-netgear_re= adynas_duo_v2.dts CONFLICT (content): Merge conflict in arch/arm/boot/dts/dove.dtsi Merging dt-rh/for-next (e48ca29d30a1 dt-bindings: add rockchip vendor prefi= x) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ven= dor-prefixes.txt Merging spi/for-next (ae49d4c5d6e9 Merge remote-tracking branches 'spi/topi= c/altera', 'spi/topic/ath79', 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/= topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/bitbang', 'spi/topic/= bpw', 'spi/topic/clps711x', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi= /topic/dw', 'spi/topic/falcon', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'sp= i/topic/hspi', 'spi/topic/mpc512x', 'spi/topic/msiof', 'spi/topic/nuc900', = 'spi/topic/oc-tiny', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', = 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/s3c24xx', 'spi/topic/s3c64= xx', 'spi/topic/sc18is602', 'spi/topic/sh', 'spi/topic/tegra114', 'spi/topi= c/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/top= ic/xcomm' into spi-next) CONFLICT (content): Merge conflict in drivers/spi/spi-mpc512x-psc.c Merging tip/auto-latest (b075a9c740e4 Merge branch 'x86/x32') Merging clockevents/clockevents/next (00e2bcd6d35f clocksource: Timer-sun5i= : Switch to sched_clock_register()) Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) Merging edac-amd/for-next (881f0fcef999 EDAC: Don't try to cancel workqueue= when it's never setup) Merging ftrace/for-next (92fdd98cf8bd tracing: Fix buggered tee(2) on traci= ng_pipe) Merging rcu/rcu/next (98cbc61863d3 Merge commit '0d3c55bc9fd58393bd3bd99749= 91ec1f815e1326' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and = singlestep exceptions) Merging kvm/linux-next (c760f5e29d92 Merge tag 'kvm-s390-20140117' of git:/= /git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-queue) Merging kvm-arm/kvm-arm-next (31ac1ca80d75 KVM: Specify byte order for KVM_= EXIT_MMIO) Merging kvm-ppc/kvm-ppc-next (27025a602cb9 powerpc: kvm: optimize "sc 1" as= fast return) 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 (c9f6e9977e38 xen/pvh: Set X86_CR0_WP and others= in CR0 (v2)) Merging percpu/for-next (d5f2deed588b Merge branch 'for-3.14' into for-next) Merging workqueues/for-next (9af16df84f0c Merge branch 'for-3.14' into for-= next) Merging drivers-x86/linux-next (b4b0b4a9e039 ipc: add intel-mid's pci id ma= cros) CONFLICT (content): Merge conflict in drivers/platform/x86/mxm-wmi.c Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister = platform driver/device when module exit) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that = may go away) Merging regmap/for-next (86776fc17497 Merge remote-tracking branch 'regmap/= topic/ack' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (44f17fa9218b leds: s3c24xx: Remove hardware.h inclus= ion) CONFLICT (content): Merge conflict in drivers/leds/leds-s3c24xx.c Merging driver-core/driver-core-next (90804ed61f24 Merge branch 'for_linus'= of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging tty/tty-next (4fbd269f1f9f Merge branch 'fixes' into tty-next) Merging usb/usb-next (90804ed61f24 Merge branch 'for_linus' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging usb-gadget/next (836a2164491b usb: phy: keystone: remove redundant = return value check of platform_get_resource()) Merging staging/staging-next (8a95c8232835 Staging: rtl8821ae: add TODO fil= e) Applying: Staging: rtl8812ae: disable due to build errors Merging char-misc/char-misc-next (90804ed61f24 Merge branch 'for_linus' of = git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging scsi/for-next (81286dea29d1 Merge branch 'fixes' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/hpsa.h CONFLICT (content): Merge conflict in drivers/scsi/hpsa.c $ git merge --abort Merging target-updates/for-next (49a47f2cafbe qla2xxx: Configure NPIV fc_vp= ort via tcm_qla2xxx_npiv_make_lport) CONFLICT (content): Merge conflict in drivers/target/target_core_tpg.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c Applying: tagtet/iblock: merge for for bvec_iter changes Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3) 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 (9aa42cbf5571 Merge branch 'devel' into for-next) Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependenc= ies for VIRTIO) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VI= RTIO) Merging gpio/for-next (75fb856bd07f Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12) Merging pwm/for-next (6691a19966f0 pwm: tiecap: Remove duplicate put_sync c= all) Merging dma-buf/for-next (17b2112f332d Merge branch 'merge' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging userns/for-next (f58437f1f916 MIPS: VPE: Remove vpe_getuid and vpe_= getgid) CONFLICT (content): Merge conflict in arch/mips/kernel/vpe.c CONFLICT (content): Merge conflict in arch/mips/include/asm/vpe.h Merging ktest/for-next (961d9caceea2 ktest: Add BISECT_TRIES to bisect test) 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 (051c8d0b6674 clk: qcom: Fix modular build) CONFLICT (content): Merge conflict in drivers/clk/samsung/clk-exynos4.c CONFLICT (content): Merge conflict in MAINTAINERS Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for th= e SHA's IV in extract_buf()) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression= speedup on ARM by using unaligned access) Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP sup= port.) Merging aio/master (8e321fefb0e6 aio/migratepages: make aio migrate pages s= ane) Merging akpm-current/current (0fc6f4e2e3d5 splice: fix unexpected size trun= cation) CONFLICT (content): Merge conflict in mm/swap.c CONFLICT (content): Merge conflict in mm/rmap.c CONFLICT (content): Merge conflict in mm/page_alloc.c CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in mm/memblock.c CONFLICT (content): Merge conflict in mm/ksm.c CONFLICT (content): Merge conflict in mm/internal.h CONFLICT (content): Merge conflict in lib/percpu_counter.c CONFLICT (content): Merge conflict in lib/Kconfig.debug CONFLICT (content): Merge conflict in include/linux/mm.h CONFLICT (content): Merge conflict in include/linux/hugetlb.h CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/ven= dor-prefixes.txt $ git checkout -b akpm remotes/origin/akpm/master Applying: kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcore= info_append_str() Applying: softirq: use ffs() in __do_softirq() Applying: softirq: convert printks to pr_ Applying: softirq: use const char * const for softirq_to_name, whitespace n= eatening Applying: mm/migrate.c: fix setting of cpupid on page migration twice again= st normal page Applying: zsmalloc: move it under mm Applying: zram: promote zram from staging Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: drivers/video/backlight/lcd.c: call put_device if device_register= fails Applying: drivers/net/phy/mdio_bus.c: call put_device on device_register() = failure Applying: checkpatch.pl: check for function declarations without arguments Applying: zram: remove old private project comment Applying: zram: add copyright Applying: zsmalloc: add copyright Applying: zram: add zram maintainers Applying: zsmalloc: add maintainers Applying: block/blk-mq-cpu.c: use hotcpu_notifier() Applying: kernel: use lockless list for smp_call_function_single Applying: kernel/smp.c: remove cpumask_ipi Applying: arm: move arm_dma_limit to setup_dma_zone Applying: zram: fix race between reset and flushing pending work Applying: zram: delay pending free request in read path Applying: zram: remove unnecessary free Applying: zram: use atomic operation for stat Applying: zram: introduce zram->tb_lock Applying: zram: remove workqueue for freeing removed pending slot Applying: zram: remove zram->lock in read path and change it with mutex Applying: mm: add strictlimit knob Merging akpm/master (5db2c68445e7 mm: add strictlimit knob) $ git checkout -b init remotes/origin/init/master Applying: x86: don't introduce more __cpuinit users in intel_mid_weak_decls= .h Applying: x86: don't add new __cpuinit users to Merrifield platform code Applying: init: delete the __cpuinit related stubs Applying: mm: replace module_init usages with subsys_initcall in nommu.c Applying: fs/notify: don't use module_init for non-modular inotify_user code Applying: netfilter: don't use module_init/exit in core IPV4 code Applying: x86: don't use module_init in non-modular intel_mid_vrtc.c Applying: x86: don't use module_init for non-modular core bootflag code Applying: x86: replace __init_or_module with __init in non-modular vsmp_64.c Applying: x86: don't use module_init in non-modular devicetree.c code Applying: drivers/tty/hvc: don't use module_init in non-modular hyp. consol= e code Applying: staging: don't use module_init in non-modular ion_dummy_driver.c Applying: powerpc: use device_initcall for registering rtc devices Applying: powerpc: book3s KVM can be modular so it should use module.h Applying: powerpc: kvm e500/44x is not modular, so don't use module_init Applying: powerpc: use subsys_initcall for Freescale Local Bus Applying: powerpc: don't use module_init for non-modular core hugetlb code Applying: powerpc: don't use module_init in non-modular 83xx suspend code Applying: arm: include module.h in drivers/bus/omap_l3_smx.c Applying: arm: fix implicit module.h use in mach-at91 gpio.h Applying: arm: fix implicit #include in entry asm. Applying: arm: mach-s3c64xx mach-crag6410-module.c is not modular Applying: arm: use subsys_initcall in non-modular pl320 IPC code Applying: arm: don't use module_init in non-modular mach-vexpress/spc.c code Applying: alpha: don't use module_init for non-modular core code Applying: sparc: don't use module_init in non-modular pci.c code Applying: m68k: don't use module_init in non-modular mvme16x/rtc.c code Applying: ia64: don't use module_init for non-modular core kernel/mca.c code Applying: ia64: don't use module_init in non-modular sim/simscsi.c code Applying: mips: make loongsoon serial driver explicitly modular Applying: mips: don't use module_init in non-modular sead3-mtd.c code Applying: cris: don't use module_init for non-modular core intmem.c code Applying: parisc: don't use module_init for non-modular core pdc_cons code Applying: mn10300: don't use module_init in non-modular flash.c code Applying: sh: don't use module_init in non-modular psw.c code Applying: xtensa: don't use module_init for non-modular core network.c code Applying: drivers/clk: don't use module_init in clk-nomadik.c which is non-= modular Applying: cpuidle: don't use modular platform register in non-modular ARM d= rivers Applying: drivers/platform: don't use modular register in non-modular pdev_= bus.c Applying: drivers/i2c: busses/i2c-acorn.c is tristate and should use module= .h Applying: module: relocate module_init from init.h to module.h Applying: logo: emit "#include in autogenerated C file Applying: arm: delete non-required instances of include Applying: mips: restore init.h usage to arch/mips/ar7/time.c Applying: sparc: delete non-required instances of include Applying: s390: delete non-required instances of include Applying: alpha: delete non-required instances of Applying: blackfin: delete non-required instances of Applying: powerpc: delete another unrequired instance of Applying: arm64: delete non-required instances of Applying: watchdog: delete non-required instances of include Applying: video: delete non-required instances of include Applying: rtc: delete non-required instances of include Applying: scsi: delete non-required instances of include Applying: spi: delete non-required instances of include Applying: acpi: delete non-required instances of include Applying: drivers/power: delete non-required instances of include Applying: drivers/media: delete non-required instances of include Applying: drivers/ata: delete non-required instances of include Applying: drivers/mtd: delete non-required instances of include Applying: drivers/hwmon: delete non-required instances of include Applying: drivers/i2c: delete non-required instances of include Applying: drivers/pinctrl: delete non-required instances of include Applying: drivers/isdn: delete non-required instances of include Applying: drivers/leds: delete non-required instances of include Applying: drivers/pcmcia: delete non-required instances of include Applying: drivers/char: delete non-required instances of include Applying: drivers/infiniband: delete non-required instances of include Applying: drivers/mfd: delete non-required instances of include Applying: drivers/gpio: delete non-required instances of include Applying: drivers/bluetooth: delete non-required instances of include Applying: drivers/mmc: delete non-required instances of include Applying: drivers/crypto: delete non-required instances of include Applying: drivers/platform: delete non-required instances of include Applying: drivers/misc: delete non-required instances of include Applying: drivers/edac: delete non-required instances of include Applying: drivers/macintosh: delete non-required instances of include Applying: drivers/base: delete non-required instances of include Applying: drivers/cpufreq: delete non-required instances of Applying: drivers/pci: delete non-required instances of Applying: drivers/dma: delete non-required instances of Applying: drivers/gpu: delete non-required instances of Applying: drivers: delete remaining non-required instances of Applying: include: remove needless instances of Merging init/master (ef8cd05b5182 include: remove needless instances of ) --Signature=_Fri__24_Jan_2014_15_40_02_+1100_CR=L9EBeRq5Kq375 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJS4e6nAAoJEMDTa8Ir7ZwVmOcP/0GJ4EMV2qnnMzWdgSmMSVhS WjIzBDa5tZ9Dq2ITkew0LX0BtuQ0eQJv/I6JGwNj2feQsail/CAMWMh2tBRiCGkQ xF3AsQERsl6dKi29ZK19Dvt3Dg9GoPr2k0FLp7ffE2xpxFLCt6qbpaPvn+DhXaNM W7Kp0OZ79l7eVX52SVUI7H44dvewla/cGGbfJv12NV+q5KuWC84CQLaPXfx+QEnt nP2mUqCup8qMZsSssXGDXu/HK0edP4eJLSGLQFpSAK4ZNpZDspYVy2r85MAKh0M5 prQVzFyk0gU4+RfR1eyhzrS9UDTNxqdBCjx9iRuLTnvUdGnk1myMfkZBV9HDBq8P kudaKK3GeQ3uIM1swt+Zgm+j5pvB/r4dhGB9tUdEbZHgujXqiGB00BkwfSL/3fAV XM+mdZzpdumkeBSXmtVGEWCPUFWPBFIXmcaBEioJNMiL4vuAWC3FhB6y51E7n1mr HBQbhG6ZFeUnLGn77l56sDHt9AZXOmpOPvoEX4nnnan2bvfLTtnL4uIwIg0WdpOt SR20gu+w5ps0QNr1/5C/v41jWglUDZK/032imM6SFc0FQunC7rJkmZ1yAjYkDMKM hM3EHv9Xx59Lm4l6QBuUZ2QWy31PuOP6drxwHgdaTKul/6oaziff41x8nhwdvIJH AeD4P1TKWTiCdlDwe6GX =6B0B -----END PGP SIGNATURE----- --Signature=_Fri__24_Jan_2014_15_40_02_+1100_CR=L9EBeRq5Kq375--