Hi all, This tree fails (more than usual) the powerpc allyesconfig build. Changes since 20140131: Dropped tree: btrfs (needs cleaning up) The powerpc tree still had its build failure. The btrfs tree had lost of conflicts against Linus' tree so I dropped it for today. Non-merge commits (relative to Linus' tree): 983 1521 files changed, 21062 insertions(+), 7748 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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (602456bf1699 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging) Merging fixes/master (b0031f227e47 Merge tag 's2mps11-build' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux) Merging arc-current/for-curr (7e22e91102c6 Linux 3.13-rc8) Merging arm-current/fixes (d326b65c57d6 ARM: fix building with gcc 4.6.4) 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 (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging net/master (4fe46b9a4d0b vxlan: remove extra newline after function definition) Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init) Merging sound-current/for-linus (75fae117a5db ALSA: hda/hdmi - allow PIN_OUT to be dynamically enabled) 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/linux/kernel/git/davem/net) Merging driver-core.current/driver-core-linus (90804ed61f24 Merge branch 'for_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 (77d143de7581 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml) Merging char-misc.current/char-misc-linus (90804ed61f24 Merge branch 'for_linus' 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" stripe) Merging crypto-current/master (ee97dc7db4cb crypto: s390 - fix des and des3_ede ctr concurrency issue) Merging ide/master (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (6f041e99fc7b of: Fix NULL dereference in unflatten_and_copy()) Merging rr-fixes/fixes (7122c3e9154b scripts/link-vmlinux.sh: only filter kernel symbols for arm) Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works) Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) Merging drm-intel-fixes/for-linux-next-fixes (09f2344d0896 drm/i915/bdw: make 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 (36dd18037119 ARC: add uImage to .gitignore) Merging arm/for-next (58b9ef24dc72 Merge branch 'cubox-i-init' into for-next) Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1) Merging arm-soc/for-next (d9edbb365758 Merge branch 'fixes' into for-next) 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' into ep93xx-for-next) Merging imx-mxs/for-next (c2335e6bb075 Merge branch 'imx/dt' into for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt 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 (39efb8a90bac 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 for-next) Merging arm64/for-next/core (c2c93e5b7f3f arm64: mm: Introduce PTE_WRITE) Merging blackfin/for-linus (58095fdaaf1c From: Eunbong Song <eunb.song@xxxxxxxxxxx>) Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h) Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference 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 reliably) Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS) Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static) Merging microblaze/next (2984128fc4f5 microblaze: Define readq and writeq IO helper function) Merging mips/mips-for-linux-next (e7651b819e90 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) 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 (a0254d5f920c parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc) Merging powerpc/next (f878f84373ae powerpc: Wire up sched_setattr and sched_getattr syscalls) Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) Merging s390/features (78191cf710b7 s390/uaccess: introduce 'uaccesspt' kernel parameter) Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging tile/master (5e01dc7b26d9 Linux 3.12) Merging uml/next (989e59fa41c5 um: Include generic barrier.h) CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) Merging xtensa/for_next (c0e50d41126e xtensa: fix fast_syscall_spill_registers) Merging btrfs/next (56817eda3c10 Btrfs: introduce the delayed inode ref deletion for the single link inode) CONFLICT (content): Merge conflict in lib/kobject.c CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c CONFLICT (content): Merge conflict in fs/btrfs/transaction.c CONFLICT (content): Merge conflict in fs/btrfs/sysfs.c CONFLICT (content): Merge conflict in fs/btrfs/super.c CONFLICT (content): Merge conflict in fs/btrfs/send.c CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c CONFLICT (content): Merge conflict in fs/btrfs/file.c CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c CONFLICT (content): Merge conflict in fs/btrfs/delayed-ref.c CONFLICT (content): Merge conflict in fs/btrfs/ctree.c CONFLICT (content): Merge conflict in fs/btrfs/acl.c $ git merge --abort Merging ceph/master (125d725c9235 ceph: cast PAGE_SIZE to size_t in ceph_sync_write()) Merging cifs/for-next (f87189f8ff97 [CIFS] Add protocol specific operation for CIFS xattrs) 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_symlink()) Merging ext4/dev (d7092ae2973f ext4: delete "set but not used" variables) Merging f2fs/dev (d891ea23d520 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client) Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF) Merging fuse/for-next (b2ec2778df9d 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 (20b9a9024540 NFSv4.1: nfs4_destroy_session must call rpc_destroy_waitqueue) Merging nfsd/nfsd-next (ed47b062ce95 nfsd: consider CLAIM_FH when handing out delegation) 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 (98009cb25d6b 9p: update documentation) Merging ubifs/linux-next (c23e9b75ccd0 UBIFS: remove invalid warn msg with tst_recovery enabled) Merging xfs/for-next (7c71ee78031c xfs: allow logical-sector sized O_DIRECT) Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification) Merging pci/next (cef09b808e58 Merge branch 'eisa' into next) Merging hid/for-next (fd7e37af337b Merge branch 'for-3.14/sony' into for-next) Merging i2c/i2c/for-next (9b0cd304f26b Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging jdelvare-hwmon/master (ac6e3e783d3e hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors) Merging hwmon-staging/hwmon-next (d303b1b5fbb6 hwmon: (k10temp) Add support for Kaveri CPUs) Merging v4l-dvb/master (167f4555184b Merge branch fixes_for_upstream into to_next) Merging kbuild/for-next (853e265ed4aa Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (efb9e0f4f437 ata: enable quirk from jmicron JMB350 for JMB394) Merging pm/linux-next (88ea0f2c02f4 Merge branches 'pm-cpufreq' and 'pm-devfreq') Merging idle/next (3b4d5c7fec0a tools/power turbostat: introduce -s to dump counters) Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (262afa97587b Merge branches 'soc-eduardo', 'soc', 'misc' and 'int3404-thermal' of .git into next) CONFLICT (content): Merge conflict in drivers/thermal/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 'swiotlb buffer is full' (v2)) Merging slave-dma/next (722a8fd0c16a Merge branch 'for-linus' into next) Merging dmaengine/next (77873803363c net_dma: mark broken) Merging net-next/master (77d143de7581 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml) Merging ipsec-next/master (abfce3ef58b6 sctp: remove the unnecessary assignment) Merging wireless-next/master (a64e1a45060f ath9k: Fix RX interrupt mitigation) Merging bluetooth/master (d04261db142d Bluetooth: Add constants for LTK key types) Merging infiniband/for-next (fb1b5034e498 Merge branch 'ip-roce' into for-next) Merging mtd/master (0e47c969c65e Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd) Merging l2-mtd/master (0ff76a920e35 mtd: gpmi: add sanity check when mapping DMA for read_buf/write_buf) Merging crypto/master (79ba451d66ca crypto: aesni - fix build on x86 (32bit)) Merging drm/drm-next (ef64cf9d0604 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next) Merging drm-intel/for-linux-next (2cac613be8d4 drm/i915: vlv: fix DP PHY lockup due to invalid PP sequencer setup) Merging drm-tegra/drm/for-next (13411ddd3190 drm/tegra: Obtain head number from DT) Merging sound/for-next (acc9146e1a2d ALSA: hda - Fix inconsistent Mic mute LED) Merging sound-asoc/for-next (5f07cd75e5e2 Merge remote-tracking branch 'asoc/fix/wm5100' into asoc-linus) Merging modules/modules-next (22e669568d51 module: Add missing newline in printk call.) Merging virtio/virtio-next (05c54de8c88c drivers: virtio: Mark function virtballoon_migratepage() as static in virtio_balloon.c) Merging input/next (50fe03da82b4 Input: uinput - add UI_GET_SYSNAME ioctl to retrieve the sysfs path) 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 (2a53fee6859b Merge branch 'for-3.14/core' into for-next) Merging device-mapper/for-next (254068f1404c dm cache: do not add migration to completed list before unhooking bio) 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 (945be38caa28 mmc: sdhci-pci: Fix possibility of chip->fixes being null) Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) 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.linaro.org/people/ljones/mfd) Merging mfd-lj/for-mfd-next (02915661dbb9 mfd: wm5110: Add register patch for rev D chip) Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data) Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (cb1fbad7ec25 Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next) Merging regulator/for-next (a3e225a6710f Merge remote-tracking branch 'regulator/fix/s2mps11' into regulator-linus) Merging security/next (923b49ff69fc Merge branch 'master' of git://git.infradead.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.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (c5321c491606 watchdog: w83627hf_wdt: Reset watchdog trigger during initialization) CONFLICT (content): Merge conflict in arch/arm/configs/bcm_defconfig CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9n12.dtsi 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' into next) 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 process document) Merging trivial/for-next (8cc7212a0361 idr: remove unused prototype of idr_free()) Merging audit/master (f3411cb2b2e3 audit: whitespace fix in kernel-parameters.txt) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (2a9330010bea dt/bindings: submitting patches and ABI documents) Merging dt-rh/for-next (e48ca29d30a1 dt-bindings: add rockchip vendor prefix) Merging spi/for-next (629a6a9c349e Merge remote-tracking branch 'spi/fix/rspi' into spi-linus) Merging tip/auto-latest (e7a00eff0e04 Merge branch 'x86/urgent') 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 (3132e107d608 tracing: Check if tracing is enabled in trace_puts()) Merging rcu/rcu/next (98cbc61863d3 Merge commit '0d3c55bc9fd58393bd3bd9974991ec1f815e1326' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) Merging kvm-arm/kvm-arm-next (b73117c49364 Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into kvm-queue) Merging kvm-ppc/kvm-ppc-next (4068890931f6 KVM: PPC: Book3S PR: Cope with doorbell interrupts) 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 (f93576e1ac34 xen/pvh: Fix misplaced kfree from xlated_setup_gnttab_pages) 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 macros) 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 (afda06ac2771 Merge remote-tracking branch 'regmap/fix/block' into regmap-linus) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (3cb6f44aedf5 leds: s3c24xx: Remove hardware.h inclusion) 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.kernel.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 (d7216f8f02da staging: r8821ae: Enable build by reverting BROKEN marking) 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 (3ce438df1068 [SCSI] hpsa: allow SCSI mid layer to handle unit attention) Merging target-updates/for-next (5259a06ef970 target: Fix percpu_ref_put race in transport_lun_remove_cmd) Merging target-merge/for-next-merge (374b105797c3 Linux 3.13-rc3) 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 (cf8400ce6fe6 imx27: pinctrl: fix wrong offset to ICONFB) Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (3a54bb21f219 gpio: xtensa: fix build when XCHAL_HAVE_CP is 0) Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12) Merging pwm/for-next (6691a19966f0 pwm: tiecap: Remove duplicate put_sync call) Merging dma-buf/for-next (0e47c969c65e Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd) Merging userns/for-next (f58437f1f916 MIPS: VPE: Remove vpe_getuid and vpe_getgid) 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 (fd3fdaf09f26 clk: sort Makefile) Merging random/dev (a9f069e38cc3 random: use the architectural HWRNG for the 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 support.) Merging aio/master (8e321fefb0e6 aio/migratepages: make aio migrate pages sane) Merging akpm-current/current (0fc6f4e2e3d5 splice: fix unexpected size truncation) CONFLICT (content): Merge conflict in mm/slab_common.c CONFLICT (content): Merge conflict in mm/rmap.c CONFLICT (content): Merge conflict in mm/page_alloc.c CONFLICT (content): Merge conflict in mm/oom_kill.c CONFLICT (content): Merge conflict in mm/nobootmem.c CONFLICT (content): Merge conflict in mm/mm_init.c CONFLICT (content): Merge conflict in mm/mempolicy.c CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in mm/memblock.c CONFLICT (content): Merge conflict in lib/vsprintf.c CONFLICT (content): Merge conflict in lib/swiotlb.c CONFLICT (content): Merge conflict in lib/percpu_counter.c CONFLICT (content): Merge conflict in lib/dma-debug.c CONFLICT (content): Merge conflict in ipc/util.c CONFLICT (content): Merge conflict in include/linux/vm_event_item.h CONFLICT (content): Merge conflict in include/linux/posix_acl.h CONFLICT (content): Merge conflict in include/linux/fsnotify_backend.h CONFLICT (content): Merge conflict in include/linux/bootmem.h CONFLICT (content): Merge conflict in fs/posix_acl.c CONFLICT (content): Merge conflict in fs/notify/notification.c CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_fsnotify.c CONFLICT (content): Merge conflict in fs/notify/fanotify/fanotify_user.c CONFLICT (add/add): Merge conflict in fs/notify/fanotify/fanotify.h CONFLICT (content): Merge conflict in fs/notify/fanotify/fanotify.c CONFLICT (content): Merge conflict in fs/afs/proc.c CONFLICT (content): Merge conflict in arch/x86/mm/srat.c CONFLICT (content): Merge conflict in arch/arm/kernel/setup.c CONFLICT (content): Merge conflict in Documentation/sysctl/kernel.txt CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt Applying: nobootmem: fix mismerge $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: arm: move arm_dma_limit to setup_dma_zone Applying: mm: add strictlimit knob Merging akpm/master (cef6af84bc44 mm: add strictlimit knob) $ git checkout -b init remotes/origin/init/master 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. console 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: 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 <linux/init.h> 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: 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: parisc64: don't use module_init for non-modular core perf 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: sh: mach-highlander/psw.c is tristate and should use module.h 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 drivers Applying: drivers/platform: don't use modular register in non-modular pdev_bus.c Applying: module: relocate module_init from init.h to module.h Applying: logo: emit "#include <linux/init.h> in autogenerated C file Applying: arm: delete non-required instances of include <linux/init.h> Applying: mips: restore init.h usage to arch/mips/ar7/time.c Applying: s390: delete non-required instances of include <linux/init.h> Applying: alpha: delete non-required instances of <linux/init.h> Applying: powerpc: delete another unrequired instance of <linux/init.h> Applying: arm64: delete non-required instances of <linux/init.h> Applying: watchdog: delete non-required instances of include <linux/init.h> Applying: video: delete non-required instances of include <linux/init.h> Applying: rtc: delete non-required instances of include <linux/init.h> Applying: scsi: delete non-required instances of include <linux/init.h> Applying: spi: delete non-required instances of include <linux/init.h> Applying: acpi: delete non-required instances of include <linux/init.h> Applying: drivers/power: delete non-required instances of include <linux/init.h> Applying: drivers/media: delete non-required instances of include <linux/init.h> Applying: drivers/ata: delete non-required instances of include <linux/init.h> Applying: drivers/hwmon: delete non-required instances of include <linux/init.h> Applying: drivers/pinctrl: delete non-required instances of include <linux/init.h> Applying: drivers/isdn: delete non-required instances of include <linux/init.h> Applying: drivers/leds: delete non-required instances of include <linux/init.h> Applying: drivers/pcmcia: delete non-required instances of include <linux/init.h> Applying: drivers/char: delete non-required instances of include <linux/init.h> Applying: drivers/infiniband: delete non-required instances of include <linux/init.h> Applying: drivers/mfd: delete non-required instances of include <linux/init.h> Applying: drivers/gpio: delete non-required instances of include <linux/init.h> Applying: drivers/bluetooth: delete non-required instances of include <linux/init.h> Applying: drivers/mmc: delete non-required instances of include <linux/init.h> Applying: drivers/crypto: delete non-required instances of include <linux/init.h> Applying: drivers/platform: delete non-required instances of include <linux/init.h> Applying: drivers/misc: delete non-required instances of include <linux/init.h> Applying: drivers/edac: delete non-required instances of include <linux/init.h> Applying: drivers/macintosh: delete non-required instances of include <linux/init.h> Applying: drivers/base: delete non-required instances of include <linux/init.h> Applying: drivers/cpufreq: delete non-required instances of <linux/init.h> Applying: drivers/pci: delete non-required instances of <linux/init.h> Applying: drivers/dma: delete non-required instances of <linux/init.h> Applying: drivers/gpu: delete non-required instances of <linux/init.h> Applying: drivers: delete remaining non-required instances of <linux/init.h> Applying: include: remove needless instances of <linux/init.h> Merging init/master (fc35201fff81 include: remove needless instances of <linux/init.h>)
Attachment:
pgpSaPuEXNkOc.pgp
Description: PGP signature
