Hi all, There will be no linux-next releases between Dec 25 and Jan 5 inclusive - unless I get extremely bored. Changes since 20131220: The powerpc tree still had its build failure for which I applied a supplied patch. The mmc tree still had its build failure so I used the version from next-20131212. The gpio tree gained a build failure for which I reverted a commit. The target-updates tree gained a conflict against Linus' tree. The akpm-current tree gained conflicts agains the pci and Linus' trees and still had its build failures for which I applied patches. Non-merge commits (relative to Linus' tree): 5223 5421 files changed, 250649 insertions(+), 134680 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 210 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 <sfr@xxxxxxxxxxxxxxxx> $ git checkout master $ git reset --hard stable Merging origin/master (413541dd66d5 Linux 3.13-rc5) 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 (b713aa0b1501 ARM: fix asm/memory.h build error) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (803c2d2f84da powerpc/powernv: Fix OPAL LPC access in Little Endian) Merging sparc/master (1de425c7b271 sparc64: Fix build regression) Merging net/master (a68f96146147 hyperv: Fix race between probe and open calls) Merging ipsec/master (965cdea82569 dccp: catch failed request_module call in dccp_probe init) Merging sound-current/for-linus (356f402da0f9 Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (f0b75693cbb2 MAINTAINERS: Add DesignWare, i.MX6, Armada, R-Car PCI host maintainers) Merging wireless/master (b7e047358449 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging driver-core.current/driver-core-linus (a8b14744429f sysfs: give different locking key to regular and bin files) Merging tty.current/tty-linus (c2db11eca089 tty: xuartps: Properly guard sysrq specific code) Merging usb.current/usb-linus (fb5f1834c322 usb: ohci-at91: fix irq and iomem resource retrieval) Merging staging.current/staging-linus (fd6040ed57d8 imx-drm: imx-drm-core: improve safety of imx_drm_add_crtc()) Merging char-misc.current/char-misc-linus (319e2e3f63c3 Linux 3.13-rc4) Merging input-current/for-linus (2a4d81547b88 Input: define KEY_WWAN for Wireless WAN) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (389a5390583a crypto: scatterwalk - Use sg_chain_ptr on chain entries) 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 (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory") 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 (a885b3ccc74d drm/i915: Use the correct GMCH_CTRL register for Sandybridge+) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (e11cbe1fbd91 ARC: [SMP] optimize IPI send and receive) Merging arm/for-next (79f82a866ed4 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 (513c9cd5be47 Merge branch 'next/dt' into for-next) Merging bcm2835/for-next (5cc686267845 Merge branch 'for-3.14/defconfig' into for-next) Merging cortex-m/for-next (9c031a483646 ARM: v7-M: drop using mach/entry-macro.S) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (a484bbed5586 Merge branches 'imx/soc' and '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 (13a3aa5a841f Merge branch 'mvebu/dt' into for-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt Merging renesas/next (833895910f5e Merge branch 'heads/sh-sci' into next) CONFLICT (content): Merge conflict in drivers/clk/Makefile Merging samsung/for-next (da1d12540174 Merge branch 'v3.14-next/dt-exynos-2' into for-next) Merging tegra/for-next (95e770a5ad96 Merge branch for-3.14/defconfig into for-next) Merging arm64/for-next/core (4e5e1eb89f48 arm64: dts: Reduce size of virtio block device for foundation model) 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 (be8cb7f42ab9 CRIS: drop unused Kconfig symbols) 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 (27d632d27c4f m68k/atari: Hide RTC_PORT() macro from rtc-cmos) Merging m68knommu/for-next (a695b9c8911e m68k : Kill CONFIG_MTD_PARTITIONS) Merging metag/for-next (40979d327c99 metag: topology: export 'cpu_core_map') Merging microblaze/next (a1dd107fcafa microblaze: Remove duplicate declarations of _stext[] and _etext[]) Merging mips/mips-for-linux-next (6ca0bf323c14 Merge branch '3.13-fixes' into mips-for-linux-next) Merging openrisc/for-upstream (60a9dd5a10a1 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 (dc1ccc48159d Linux 3.13-rc2) Merging powerpc/next (75eb3d9b60c2 powerpc/powernv: Get FSP memory errors and plumb into memory poison infrastructure.) Applying: powerpc: Fix "attempt to move .org backwards" error Merging mpc5xxx/next (8c699054e995 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 (91f3e3eaba44 s390/zcrypt: add support for EP11 coprocessor cards) 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 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 (d30841d27218 xtensa: ISS: avoid simple_strtoul usage) Merging btrfs/next (91aef86f3b8a Btrfs: rename btrfs_start_all_delalloc_inodes) Merging ceph/master (8eb4efb091c8 ceph: implement readv/preadv for sync operation) Merging cifs/for-next (cfae639783f0 cifs: set FILE_CREATED) 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 (df4e7ac0bb70 ext2: Fix oops in ext2_get_block() called from ext2_quota_write()) Merging ext4/dev (c25625a1b6a5 ext4: enable punch hole for bigalloc) Merging f2fs/dev (187393bcb95e f2fs: add description about small_discards in document) 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 (e6ee054c3dbb GFS2: Wait for async DIO in glock state changes) Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (23e66ba97127 rpc_pipe: fix cleanup of dummy gssd directory when notification fails) Merging nfsd/nfsd-next (a0ef5e19684f nfsd: don't try to reuse an expired DRC entry off the list) 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 (f94741fd2832 net/9p: remove virtio default hack and set appropriate bits instead) Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range) Merging xfs/for-next (324bb26144e9 Merge branch 'xfs-for-linus-v3.13-rc5' into for-next) Merging vfs/for-next (27ac0ffeac80 locks: break delegations on any attribute modification) Merging pci/next (79bf7fc51118 Merge branch 'pci/misc' into next) Merging hid/for-next (6d36023ee164 Merge branch 'for-3.14/upstream' into for-next) Merging i2c/i2c/for-next (319e2e3f63c3 Linux 3.13-rc4) Merging jdelvare-hwmon/master (68d5516b35c7 hwmon: (it87) Print proper names for the IT8771E and IT8772E) Merging hwmon-staging/hwmon-next (4000fd328602 hwmon: (coretemp) Do not return -EAGAIN for low temperatures) Merging v4l-dvb/master (c4f181f1efc5 Merge branch 'v4l_for_linus' into temp) Merging kbuild/for-next (e6483a58eca6 Merge branch 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm') Merging libata/for-next (23f5e334cbd9 Merge branch 'for-3.13-fixes' into for-next) Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block) Merging pm/linux-next (ba9c26277782 Merge branch 'acpi-cleanup-next' into linux-next) Merging idle/next (1ae2a8af4228 tools/power turbostat: run on HSX) Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (86e0a0bdf81c Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next) Merging ieee1394/for-next (ce027ed98fd1 firewire: sbp2: bring back WRITE SAME support) Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap()) Merging dlm/next (ece35848c184 dlm: set zero linger time on sctp socket) Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers) Merging slave-dma/next (087a45b74e02 Merge branch 'for-linus' into next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx53.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx51.dtsi Merging dmaengine/next (77873803363c net_dma: mark broken) Merging net-next/master (289dccbe141e net: use kfree_skb_list() helper) Merging ipsec-next/master (852ad5e63196 Merge branch 'bridge_cleanups') Merging wireless-next/master (39731b78b4af ath9k: simplify/fix tx packet TID handling) Merging bluetooth/master (c567c77101f0 6lowpan: cleanup udp compress function) Merging infiniband/for-next (d8a0f63e2a7b Merge branches 'cxgb4', 'flowsteer', 'misc', 'ocrdma' and 'usnic' into for-next) Merging mtd/master (15b540c71cac mtd: nand: pxa3xx: Use info->use_dma to release DMA resources) Merging l2-mtd/master (dd0a577efe72 mtd: nand: pxa3xx: Consolidate ECC initialization) Merging crypto/master (4e6e0b272d5a crypto: caam - simplify and harden key parsing) Merging drm/drm-next (fe3c703c3d80 drm/dp: Clarify automated test constant and add constant for FAUX test pattern) 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/drm_stub.c Merging drm-intel/for-linux-next (d8ccba866356 drm/i915: grab a pages pin count for preallocate stolen) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c Merging drm-tegra/drm/for-next (81239c6f7972 drm/tegra: fix compile w/ CONFIG_DYNAMIC_DEBUG) Merging sound/for-next (19570d747795 ALSA: usb-audio: Add a quirk for Plantronics Gamecom 780) Merging sound-asoc/for-next (499715902043 Merge remote-tracking branch '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 (01d08185850c Input: fix typos in Documentation/input/gamepad.txt) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging cgroup/for-next (824960aa4e6c Merge branch 'for-3.13-fixes' into for-next) Merging block/for-next (391b7a7bfb52 Merge branch 'for-3.14/drivers' into for-next) CONFLICT (content): Merge conflict in include/trace/events/f2fs.h CONFLICT (content): Merge conflict in fs/logfs/dev_bdev.c 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/scrub.c CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/check-integrity.c CONFLICT (content): Merge conflict in block/blk-flush.c Merging device-mapper/for-next (3b1e77ef973f dm cache policy mq: introduce three promotion threshold tunables) 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 (82793a517714 mmc: sh_mmcif: Fix compilation warning on 64-bit platforms) $ git reset --hard HEAD^ Merging next-20131212 version of mmc Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) CONFLICT (content): Merge conflict in kernel/debug/debug_core.h Merging slab/for-next (e1168c2cc4a5 slab.h: remove duplicate kmalloc declaration and fix kernel-doc warnings) 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 (6a48ec837ea1 mfd: rtsx: Add support for card reader rtl8402) Merging battery/master (d36240d26025 power_supply: Add power_supply notifier) 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 (46ac29568e63 video: vt8500: fix error handling in probe()) Merging regulator/for-next (3852b4bb7fb8 Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next) Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring) Merging selinux/master (465954cd649a selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock()) CONFLICT (content): Merge conflict in security/selinux/hooks.c Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging watchdog/master (28748defa512 watchdog: remove DEFINE_PCI_DEVICE_TABLE macro) 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 (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' 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 (5e4fcf9d5e4c doc: driver-model/platform.txt: fix a typo) Merging audit/master (fc582aef7dcc Merge tag 'v3.12') 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 (1b50b0c3330e Merge branch 'for-3.14' into for-next) Merging spi/for-next (7c9a29c17875 Merge remote-tracking branches 'spi/topic/ath79', 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/topic/bcm63xx', 'spi/topic/bcm63xx-hsspi', 'spi/topic/coldfire', 'spi/topic/davinci', 'spi/topic/designware', 'spi/topic/falcon', 'spi/topic/fsl-espi', 'spi/topic/gpio', 'spi/topic/mpc512x', 'spi/topic/msiof', 'spi/topic/nuc900', 'spi/topic/omap', 'spi/topic/orion', 'spi/topic/pci', 'spi/topic/qspi', 'spi/topic/rcar', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sc18is602', '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 (66fa28e2bb4a Merge branch 'x86/ras') Merging clockevents/clockevents/next (98aefbe72ec6 Merge branch 'clockevents/for-Simon-3.13-rc2' into clockevents/3.14) CONFLICT (content): Merge conflict in drivers/clocksource/clksrc-of.c Merging edac/linux_next (3e45588825c1 cell_edac: fix missing of_node_put) Merging edac-amd/for-next (90ed4988b8c0 e752x_edac: Fix pci_dev usage count) Merging ftrace/for-next (3ccb01239201 tracing: Only run synchronize_sched() at instance deletion time) 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 (989c6b34f6a9 KVM: MMU: handle invalid root_hpa at __direct_map) Merging kvm-arm/kvm-arm-next (478a8237f656 arm: KVM: Don't return PSCI_INVAL if waitqueue is inactive) 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 (85be9741104f Merge branch 'stable/for-linus-3.13' into linux-next) Merging percpu/for-next (b1a0fbfdde65 percpu: fix spurious sparse warnings from DEFINE_PER_CPU()) Merging workqueues/for-next (4e8b22bd1a37 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues) 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 (057c2d5071eb 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 (da2cbb0f96cb leds: pwm: Remove a warning on non-DT platforms) Merging driver-core/driver-core-next (41f107266b19 drivers: base: Add prototype declaration to the header file) Merging tty/tty-next (351d6204bfc8 tty: an overflow of multiplication in drivers/tty/cyclades.c) Merging usb/usb-next (3482528e9ace USB: core: remove CONFIG_USB_DEBUG usage) CONFLICT (content): Merge conflict in drivers/usb/host/ohci-at91.c Merging usb-gadget/next (8ed1fb790ea2 usb: musb: finish suspend/reset work independently from musb_hub_control()) CONFLICT (content): Merge conflict in drivers/usb/phy/Kconfig Merging staging/staging-next (1785faacf3ac staging: line6: Add support for POD HD400 to line6usb driver) CONFLICT (content): Merge conflict in drivers/staging/imx-drm/imx-drm-core.c Merging char-misc/char-misc-next (a45a0258d1f8 GenWQE: Accidently casting to u32 where u64 is required) Merging scsi/for-next (81286dea29d1 Merge branch 'fixes' into for-next) Merging target-updates/for-next (d79dc4525ad5 target: Convert inquiry temporary buffer to heap memory) 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 (44a45b55a727 pinctrl: sh-pfc: ARM: Constify pins and cfg_regs arrays) CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-sh7372.c CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/pfc-r8a7740.c 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 (41c3548e6da6 ARM: s3c64xx: get rid of custom <mach/gpio.h>) 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 (a5d37d22b548 Merge tag 'mvebu-clk-3.14' of git://git.infradead.org/linux-mvebu into clk-next) 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 (3d655d441006 ipc,sem: correct header comment for perform_atomic_semop) CONFLICT (content): Merge conflict in scripts/checkpatch.pl CONFLICT (content): Merge conflict in mm/memory.c CONFLICT (content): Merge conflict in include/linux/mm.h Applying: memblock-make-memblock_set_node-support-different-memblock_type-fix Applying: rtc: hym8563: include clkout code only if COMMON_CLK active $ git checkout -b akpm remotes/origin/akpm/master 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: mm: add strictlimit knob Merging akpm/master (91cc9ba0060c mm: add strictlimit knob) [master c05952f2ddb8] Revert "gpio: add GPIO support for SMSC SCH311x"
Attachment:
pgpqmEE5GYUc0.pgp
Description: PGP signature
