Hi all, This tree fails (more than usual) the powerpc allyesconfig build.
Changes since 20140113: Dropped tree: sh (complex merge conflicts against very old commits) The powerpc tree still had its build failure. The v4l-dvb tree gained a conflict against Linus' tree. The tip tree gained a build failure for which I reverted a commit from the pm tree. The kvm tree still had its build failure so I used the version from next-20140109. The akpm-current tree gained conflicts against the char-misc and tip trees. Non-merge commits (relative to Linus' tree): 8567 7924 files changed, 409038 insertions(+), 213932 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 209 trees (counting Linus' and 29 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 s...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (a6da83f98267 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) 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 (1e01c7eb7c43 ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h) Merging arm-current/fixes (b25f3e1c3584 ARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (10348f597683 powerpc: Check return value of instance-to-package OF call) 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 (9ef9730ba84d cxgb4: silence shift wrapping static checker warning) Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init) Merging sound-current/for-linus (150116bcfbd9 ALSA: hiface: Fix typo in 352800 rate definition) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (2eff7c791a18 Merge tag 'nfc-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes) Merging driver-core.current/driver-core-linus (413541dd66d5 Linux 3.13-rc5) Merging tty.current/tty-linus (413541dd66d5 Linux 3.13-rc5) Merging usb.current/usb-linus (413541dd66d5 Linux 3.13-rc5) Merging staging.current/staging-linus (413541dd66d5 Linux 3.13-rc5) Merging char-misc.current/char-misc-linus (802eee95bde7 Linux 3.13-rc6) Merging input-current/for-linus (8e2f2325b73f Input: xpad - add new USB IDs for Logitech F310 and F710) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (efb753b8e013 crypto: ixp4xx - Fix kernel compile error) Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions) 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 (d8e8c7dda11f ARC: [SMP] optimize IPI send and receive) Merging arm/for-next (332026761528 Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next) Merging arm-perf/for-next/perf (6ce4eac1f600 Linux 3.13-rc1) Merging arm-soc/for-next (16c2a53ef8ed Merge branch 'next/fixes-non-critical' into for-next) 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' into ep93xx-for-next) Merging imx-mxs/for-next (c360e699d3bf Merge branch 'imx/dt' into for-next) 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 (6da7d0ea74e4 Merge branch 'mvebu/dt' into for-next) Merging renesas/next (2fb5c387800c Merge branch 'heads/soc-fixes-for-v3.14' 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 (65c021bb496a arm64: kernel: restore HW breakpoint registers in cpu_suspend) Merging blackfin/for-linus (36855dcfc980 blackfin: fix build warning for unused variable) Merging c6x/for-linux-next (546153d75a48 c6x: fix build failure caused by cache.h) Merging cris/for-next (329fddd7b60c cris: sync_serial: remove interruptible_sleep_on) 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 (a0b7b242261c m68k/irq - Use polled IRQ flag for MFP timer cascaded interrupts) Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS) Merging metag/for-next (e9a1d0165bbd metag/smp: Make boot_secondary() static) Merging microblaze/next (a23e64af1a9b microblaze: Simplify fcpu helper function) Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' into mips-for-linux-next) Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (7d1c153ab373 Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) Merging powerpc/next (dece8ada993e Merge branch 'merge' into next) 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 (28aa39b853fc s390: delete new instances of __cpuinit usage) Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) CONFLICT (content): Merge conflict in include/linux/serial_sci.h CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile $ git merge --abort Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging tile/master (5e01dc7b26d9 Linux 3.12) Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL) Merging xtensa/for_next (62ff7ff3e949 xtensa: use mac_ptron to extract the mac addr (iss/net)) Merging btrfs/next (56817eda3c10 Btrfs: introduce the delayed inode ref deletion for the single link inode) Merging ceph/master (8eb4efb091c8 ceph: implement readv/preadv for sync operation) Merging cifs/for-next (a2e70b4d4e85 cifs: Fix memory leak in cifs_hardlink()) 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 (27e25f8135e5 ext4: standardize error handling in ext4_da_write_inline_data_begin()) Merging f2fs/dev (3bac380c9012 f2fs: update documents and a MAINTAINERS entry) Merging fscache/fscache (7c604e5d6e56 FS-Cache: Fix handling of an attempt to store a page that is now beyond EOF) Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release) Merging gfs2/master (39849d6946a8 GFS2: Add initialization for address space in super block) 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 (16a6ddc70920 point to the right include file in a comment (left over from a9004abc3)) Merging nfsd/nfsd-next (3554116d3aae nfsd4: simplify xdr encoding of nfsv4 names) 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=mmap 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-fixes' into for-next) Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification) Merging pci/next (96702be56037 Merge branch 'pci/resource' into next) Merging hid/for-next (b18c2fbc3e1a Merge branch 'for-3.14/upstream' into for-next) Merging i2c/i2c/for-next (001cebf03f91 i2c-ismt: support I2C_SMBUS_I2C_BLOCK_DATA transaction type) Merging jdelvare-hwmon/master (68d5516b35c7 hwmon: (it87) Print proper names for the IT8771E and IT8772E) Merging hwmon-staging/hwmon-next (1d83e1cfbf43 hwmon: (sht15) add include guard) Merging v4l-dvb/master (e26d710a8cdf Merge branch 'patchwork' into to_next) CONFLICT (content): Merge conflict in drivers/staging/media/go7007/go7007-usb.c Merging kbuild/for-next (ddbfd0b07555 Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm') Merging libata/for-next (ed9ce962df91 Merge branch 'for-3.14' into for-next) CONFLICT (content): Merge conflict in drivers/ata/ahci.c Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block) Merging pm/linux-next (001994dfe0d6 Merge branch 'pm-cpuidle-next' into linux-next) Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX) 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 (c698a4492f01 Merge branch 'misc' of .git into next) CONFLICT (content): Merge conflict in drivers/cpufreq/Kconfig Merging ieee1394/for-next (8bc588e0e585 firewire: ohci: Turn remote DMA support into a module parameter) 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 (7ae2c0ce15b0 Merge branch 'for-linus' into next) Merging dmaengine/next (77873803363c net_dma: mark broken) Merging net-next/master (7e11daa7c19e packet: doc: describe PACKET_MMAP with one packet socket for rx and tx) Merging ipsec-next/master (6bae91900360 {xfrm,pktgen} Fix compiling error when CONFIG_XFRM is not set) CONFLICT (content): Merge conflict in net/xfrm/xfrm_policy.c Merging wireless-next/master (608cfbe4abaf p54: clamp properly instead of just truncating) Merging bluetooth/master (91eb476fb032 Bluetooth: Convert to use ATTRIBUTE_GROUPS macro) Applying: net: 6lowpan: fixup for code movement Merging infiniband/for-next (1de6c2e202a4 Merge branches 'ocrdma' and 'usnic' into for-next) Merging mtd/master (802eee95bde7 Linux 3.13-rc6) Merging l2-mtd/master (1963ff97ca46 mtd: nand: pxa3xx: Add "armada370-nand" compatible) Merging crypto/master (d16b87003ff4 crypto: drivers - Sort drivers/crypto/Makefile) Merging drm/drm-next (859ae233cd0e Merge tag 'drm-intel-next-2013-12-13' of git://people.freedesktop.org/~danvet/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-drm-core.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_stub.c Merging drm-intel/for-linux-next (534e3730732e drm/i915: Clarify relocation errnos) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c Merging drm-tegra/drm/for-next (81239c6f7972 drm/tegra: fix compile w/ CONFIG_DYNAMIC_DEBUG) Merging sound/for-next (80ab8eae70e5 ALSA: Enable CONFIG_ZONE_DMA for smaller PCI DMA masks) CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c Merging sound-asoc/for-next (e69f0f3d9241 Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/au1x', 'asoc/topic/axi', 'asoc/topic/bcm2835', 'asoc/topic/blackfin', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/davinci', 'asoc/topic/docs', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/fsl-mxs', 'asoc/topic/generic', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc/topic/max98090', 'asoc/topic/mc13783', 'asoc/topic/mxs', 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/s6000', 'asoc/topic/sai', 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/sh', 'asoc/topic/spear', 'asoc/topic/ssm2518', 'asoc/topic/ssm2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl4030', 'asoc/topic/twl6040', 'asoc/topic/txx9', 'asoc/topic/uda1380', 'asoc/topic/ux500', 'asoc/topic/width', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next) CONFLICT (content): Merge conflict in sound/soc/fsl/fsl_ssi.c Merging modules/modules-next (74e22fac8858 module.h: Remove unnecessary semicolon) CONFLICT (add/add): Merge conflict in Documentation/module-signing.txt Merging virtio/virtio-next (7d2dddda5c92 virtio: pci: remove unnecessary pci_set_drvdata()) Merging input/next (c3c4d99485ea Input: hyperv-keyboard - pass through 0xE1 prefix) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging cgroup/for-next (d0cb1a84439e Merge branch 'for-3.14' into for-next) Merging block/for-next (454e2c4cbd66 Merge branch 'for-3.14/core' into for-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 Merging device-mapper/for-next (6a388618f120 dm cache: add block sizes and total cache blocks to status output) CONFLICT (content): Merge conflict in drivers/md/dm-thin.c 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 (a7f2be94be93 mmc: sdhci-esdhc-imx: fix warning during module remove function) 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 (6d183de40771 md/raid5: fix newly-broken locking in get_active_stripe.) 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 (c02ba56a19af mfd: omap-usb-tll: Don't hold lock during pm_runtime_get/put_sync()) Merging battery/master (26740dbb50f2 max17042_battery: Add IRQF_ONESHOT flag to use default irq handler) 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 (662c00a674ff Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next) Merging regulator/for-next (3def49054350 Merge remote-tracking branches 'regulator/topic/ab8500', 'regulator/topic/act8865', 'regulator/topic/anatop', 'regulator/topic/arizona', 'regulator/topic/as3722', 'regulator/topic/db8500', 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/max14577', 'regulator/topic/max77693', 'regulator/topic/mc13892', 'regulator/topic/pcf50633', 'regulator/topic/pfuze100', 'regulator/topic/s2mps11', 'regulator/topic/s5m8767', 'regulator/topic/stw481x-vmmc', 'regulator/topic/tps51632', 'regulator/topic/tps62360', 'regulator/topic/tps65910', 'regulator/topic/twl' and 'regulator/topic/wm831x' into regulator-next) Merging security/next (923b49ff69fc Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next) CONFLICT (content): Merge conflict in drivers/char/tpm/tpm_ppi.c Merging selinux/master (8ed814602876 SELinux: Fix memory leak upon loading policy) Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (b7a5974ded2f watchdog: bcm281xx: Debugfs support) 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 (d10999016f41 vfio: Convert control interface to misc driver) Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error) Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) Merging trivial/for-next (9c8f6820f0d7 doc: Fix typo in USB Gadget Documentation) CONFLICT (content): Merge conflict in drivers/gpu/drm/qxl/Kconfig Merging audit/master (affdb2c94cfc audit: get rid of *NO* daemon at audit_pid=0 message) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow) Merging dt-rh/for-next (1ca56e7dcadd of: irq: Ignore disabled intc's when searching map) Merging spi/for-next (c395f449e934 Merge remote-tracking branches 'spi/topic/altera', 'spi/topic/ath79', 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/bitbang', 'spi/topic/clps711x', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/dw', 'spi/topic/falcon', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/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/qspi', 'spi/topic/rcar', 'spi/topic/rspi', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', 'spi/topic/sh', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-next) CONFLICT (content): Merge conflict in drivers/spi/spi-mpc512x-psc.c Merging tip/auto-latest (d30fd173fd96 Merge branch 'x86/x32') 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 CONFLICT (content): Merge conflict in arch/xtensa/include/asm/barrier.h CONFLICT (content): Merge conflict in arch/score/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/parisc/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/mn10300/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/hexagon/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/arc/include/asm/Kbuild [master 4e3b446a7695] Revert "speedstep-smi: enable interrupts when waiting" Merging clockevents/clockevents/next (98aefbe72ec6 Merge branch 'clockevents/for-Simon-3.13-rc2' into clockevents/3.14) 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 (405e1d834807 ftrace: Synchronize setting function_trace_op with ftrace_trace_function) Merging rcu/rcu/next (0d3c55bc9fd5 Merge branches 'doc.2013.12.03a', 'fixes.2013.12.12a', 'rcutorture.2013.12.03a' and 'sparse.2013.12.12a' into HEAD) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (26a865f4aa8e KVM: VMX: fix use after free of vmx->loaded_vmcs) $ git reset --hard HEAD^ Merging next-20140109 version of kvm Merging kvm-arm/kvm-arm-next (61466710de07 KVM: ARM: Remove duplicate include) 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_work) Merging xen-tip/linux-next (54d44eb3c7f6 xen/pvh: Use 'depend' instead of 'select'.) CONFLICT (content): Merge conflict in arch/arm/include/asm/xen/page.h Merging percpu/for-next (3e7da78e081e percpu: use VMALLOC_TOTAL instead of VMALLOC_END - VMALLOC_START) Merging workqueues/for-next (9af16df84f0c Merge branch 'for-3.14' into for-next) CONFLICT (content): Merge conflict in kernel/workqueue.c Merging drivers-x86/linux-next (a80e1053aaa3 x86, wmi fix modalias_show return values) 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 inclusion) Merging driver-core/driver-core-next (683bb2761fbf Revert "kernfs: fix get_active failure handling in kernfs_seq_*()") Merging tty/tty-next (3685f19e0780 serial: 8250: enable UART_BUG_NOMSR for Tegra) Merging usb/usb-next (f563926fed98 usb: cdc-wdm: resp_count can be 0 even if WDM_READ is set) Merging usb-gadget/next (836a2164491b usb: phy: keystone: remove redundant return value check of platform_get_resource()) Merging staging/staging-next (69ba83585a22 Staging: comedi: fix extra whitespace style issues in ni_mio_common.c.) CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-drm-core.c Merging char-misc/char-misc-next (6adb8efb024a mei: limit the number of consecutive resets) Merging scsi/for-next (81286dea29d1 Merge branch 'fixes' into for-next) Merging target-updates/for-next (b2ec6d36d271 IB/isert: pass scatterlist instead of cmd to fast_reg_mr routine) CONFLICT (content): Merge conflict in drivers/target/target_core_tpg.c 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 (8385af02bad1 pinctrl: sirf: add pin group for USP0 with only RX or TX frame sync) 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 (ccb6fbb99020 Documentation / ACPI: update to GPIO descriptor API) CONFLICT (content): Merge conflict in drivers/leds/leds-s3c24xx.c CONFLICT (content): Merge conflict in arch/xtensa/Kconfig Merging dma-mapping/dma-mapping-next (5e01dc7b26d9 Linux 3.12) Merging pwm/for-next (82569e5b2236 pwm: tiehrpwm: use dev_err() instead of pr_err()) Merging dma-buf/for-next (17b2112f332d Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging userns/for-next (41301ae78a99 vfs: Fix a regression in mounting proc) Merging ktest/for-next (298a0d1d5750 ktest: Add documentation of CLOSE_CONSOLE_SIGNAL) 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 (baa39cd20ece Merge tag 'for_3.14/samsung-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tfiga/samsung-clk into clk-next-samsung) 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 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 (7679372dd5f9 ipc: whitespace cleanup) CONFLICT (content): Merge conflict in kernel/futex.c CONFLICT (content): Merge conflict in drivers/misc/mei/init.c CONFLICT (content): Merge conflict in drivers/misc/mei/hbm.c $ git checkout -b akpm remotes/origin/akpm/master Applying: net/ipv6/ip6_vti.c: fix build Applying: kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str() Applying: softirq: use ffs() in __do_softirq() Applying: softirq: convert printks to pr_<level> Applying: softirq: use const char * const for softirq_to_name, whitespace neatening Applying: mm/migrate.c: fix set cpupid on page migration twice against thp Applying: mm/migrate.c: fix setting of cpupid on page migration twice against 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: mm: add strictlimit knob Merging akpm/master (af6c8e7769ad mm: add strictlimit knob)
pgpbXDzPH9_fN.pgp
Description: PGP signature
