Hi all, There will be no linux-next release until April 22 - have a nice break. This tree still fails (more than usual) the powerpc allyesconfig build. Changes since 20140416: Dropped tree: userns (complex conflicts) The powerpc tree still had its build failure. The sound-asoc tree lost its build failure. The ipsec tree gained a conflict against Linus' tree. The crypto tree gained conflicts against Linus' tree. The staging tree gained a conflict against the staging.current tree. The userns tree gained complex conflicts against Linus' tree so I dropped it for today. The akpm-current tree lost its build failures but gained another for which I reverted a commit. Non-merge commits (relative to Linus' tree): 1291 1623 files changed, 29566 insertions(+), 49753 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 (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 214 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 (6ca2a88ad820 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) 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 (38dbfb59d117 Linus 3.14-rc1) Merging arc-current/for-curr (0409726a81f2 ARC: fix mmuv2 warning) Merging arm-current/fixes (c9d347e02776 ARM: 8009/1: dcscb.c: remove call to outer_flush_all()) Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1) Merging metag-fixes/fixes (0414855fdc4a Linux 3.14-rc5) Merging powerpc-merge/merge (cc4f265ad9a3 powerpc/powernv Adapt opal-elog and opal-dump to new sysfs_remove_file_self) Merging sparc/master (455c6fdbd219 Linux 3.14) Merging net/master (0acf07d240a8 seccomp: fix memory leak on filter attach) Merging ipsec/master (a32452366b72 vti4: Don't count header length twice.) CONFLICT (content): Merge conflict in net/ipv4/ip_vti.c Merging sound-current/for-linus (8dc9abb93dde ALSA: hda/realtek - Add headset Mic support for Dell machine) Merging pci-current/for-linus (f5d3352b2751 PCI: tegra: Use new OF interrupt mapping when possible) Merging wireless/master (f8d2b9209ad6 mwifiex: fix hung task on command timeout) Merging driver-core.current/driver-core-linus (98b0f811aade Documentation: Update stable address in Chinese and Japanese translations) Merging tty.current/tty-linus (1e7da0530423 serial: amba-pl011: fix regression, causing an Oops on rmmod) Merging usb.current/usb-linus (94d72f008909 uas: fix deadlocky memory allocations) Merging staging.current/staging-linus (33c84bc14c25 staging: r8188eu: Fix case where ethtype was never obtained and always be checked against 0) Merging char-misc.current/char-misc-linus (03367ef5ea81 Drivers: hv: vmbus: Negotiate version 3.0 when running on ws2012r2 hosts) Merging input-current/for-linus (692d96552c9a Merge branch 'next' into for-linus) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (eb4a5346e777 hwrng: bcm2835 - fix oops when rng h/w is accessed during registration) Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (1f42e5dd5065 of: Add self test for of_match_node()) 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 (b6842feb63a2 drm/i915: Allow user modes to exceed DVI 165MHz limit) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (c9eaa447e77e Linux 3.15-rc1) Merging arm/for-next (98f07013149d Merge branch 'devel-stable' into for-next) Merging arm-kvm-cpuresume/arm-kvm-cpuresume (91a3f6af430d arm: kernel: sleep: restore HYP mode configuration in cpu_resume) Merging arm-perf/for-next/perf (c9eaa447e77e Linux 3.15-rc1) Merging arm-soc/for-next (2bf73dd61a84 Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) Merging berlin/berlin/for-next (e49c50df1e18 Merge branch 'berlin/dt' into berlin/for-next) Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (1e9dfe21eca8 Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (47fc77cc704e Merge branch 'for_3.15/fixes' into next) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (6412d6635b67 Merge branch 'mvebu/dt-fixes-non-critical' into for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile Merging renesas/next (47a0013abaee Merge branches 'heads/next', 'heads/boards-for-v3.16' and 'heads/dt-for-v3.16' into devel) Merging samsung/for-next (c9eaa447e77e Linux 3.15-rc1) Merging tegra/for-next (628d56b42d35 Merge branch for-3.16/defconfig into for-next) Merging arm64/for-next/core (ebf81a938dad arm64: Fix DMA range invalidation for cache line unaligned buffers) Merging blackfin/for-linus (c4a2c58d2095 blackfin: cleanup board files) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf) Merging m68k/for-next (50be9eba831d m68k: Update defconfigs for v3.14-rc1) Merging m68knommu/for-next (2bf0787b4b42 m68k: fix a compiler warning when building for DragonBall) Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE) Merging microblaze/next (a66a626538af microblaze: Use asm-generic/io.h) Merging mips/mips-for-linux-next (0c61dd849d8c Merge branch '3.15-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 (ab3e55b119c9 parisc: fix epoll_pwait syscall on compat kernel) Merging powerpc/next (cd427485357c Merge remote-tracking branch 'scott/next' 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 (4c0fda161346 s390/cmma: remove "cmma disable" code in case of dump again) Merging sparc-next/master (049ffa8ab33a Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux) Merging tile/master (5eb0bdf84433 arch/tile: remove unused variable 'devcap') 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 (cfe8255f0afc xtensa: xt2000: drop redundant sysmem initialization) Merging btrfs/next (00fdf13a2e9f Btrfs: fix a crash of clone with inline extents's split) Merging ceph/master (a30be7cb2ccb ceph: skip invalid dentry during dcache readdir) Merging cifs/for-next (a5a64da8c4e5 fs: cifs: remove unused variable.) 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 (01d8885785a6 reiserfs: fix race in readdir) Merging ext4/dev (dd346d66aa92 i386: add renameat2 syscall) Merging f2fs/dev (350ca07320d4 f2fs: remove costly dirty_dir_inode operations) Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) Merging fuse/for-next (f3846266f593 fuse: fix "uninitialized variable" warning) Merging gfs2/master (c9eaa447e77e Linux 3.15-rc1) Merging jfs/jfs-next (24e4a0f3de21 fs/jfs/jfs_inode.c: atomically set inode->i_flags) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (1f2edbe3fe21 NFS: Don't ignore suid/sgid bit changes after a successful write) Merging nfsd/nfsd-next (06f9cc12caa8 nfsd4: don't create unnecessary mask acl) 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 (c9eaa447e77e Linux 3.15-rc1) Merging ubifs/linux-next (d56030ac25d3 UBI: block: Remove __initdata from ubiblock_param_ops) Merging xfs/for-next (330033d697ed xfs: fix tmpfile/selinux deadlock and initialize security) Merging file-private-locks/linux-next (f1c6bb2cb8b8 locks: allow __break_lease to sleep even when break_time is 0) Merging vfs/for-next (527d1511310a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) Merging pci/next (c9eaa447e77e Linux 3.15-rc1) Merging hid/for-next (12e5706a47c2 Merge branch 'for-3.16/rmi4' into for-next) Merging i2c/i2c/for-next (9e897e13bd46 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd) Merging jdelvare-hwmon/master (455c6fdbd219 Linux 3.14) Merging hwmon-staging/hwmon-next (046f3ea7c6af hwmon: (lm77) Drop FSF mailing address) Merging v4l-dvb/master (b40dfe97cc3a Merge branch 'v4l_for_linus' into to_next) Merging kbuild/for-next (de71647f7af0 Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (73ff0e9080ed Merge branch 'for-3.15-fixes' into for-next) Merging pm/linux-next (19ce7f3f3110 Merge branch 'acpi-config') Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release) 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 (9477165ec525 thermal: rcar-thermal: update thermal zone only when temperature changes) Merging ieee1394/for-next (0ca49345b6f4 firewire: ohci: fix probe failure with Agere/LSI controllers) Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages) Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2)) Merging slave-dma/next (8edc51c197b8 dma: fix eDMA driver as a subsys_initcall) Merging dmaengine/next (b9bf6d2e84b7 dma: mv_xor: Flush descriptors before activating a channel) Merging net-next/master (cd6362befe4c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) Merging ipsec-next/master (cd6362befe4c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) Merging wireless-next/master (321d03c86732 Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild) Merging bluetooth/master (899704633969 Bluetooth: Fix redundant encryption request for reauthentication) Merging infiniband/for-next (5ae2866f5264 Merge branches 'cxgb4', 'misc', 'mlx5' and 'qib' into for-next) Merging mtd/master (c9eaa447e77e Linux 3.15-rc1) Merging l2-mtd/master (6189cccbe8d1 mtd: gpmi: add gpmi_devdata{} to simplify the code) Merging crypto/master (f51f593b3eb1 crypto: omap-des - handle error of pm_runtime_get_sync) CONFLICT (rename/delete): drivers/crypto/bfin_crc.h deleted in HEAD and renamed in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.h left in tree. CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig Merging drm/drm-next (c39b06951f1d DRM: armada: fix corruption while loading cursors) Merging drm-intel/for-linux-next (c79057922ed6 drm/i915: Remove vblank wait from haswell_write_eld) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_context.c Merging drm-tegra/drm/for-next (3d1c1474386e drm/tegra: Use standard GPL v2 license text) Merging sound/for-next (00d90154404a ALSA: pcm: 'BUG:' message unnecessarily triggers kerneloops) Merging sound-asoc/for-next (df9a50e93aa5 Merge remote-tracking branches 'asoc/topic/rt5640', 'asoc/topic/sirf', 'asoc/topic/sta350' and 'asoc/topic/tmp-of' into asoc-next) Merging modules/modules-next (22c9bcad859d staging: fix up speakup kobject mode) Merging virtio/virtio-next (fc4324b4597c virtio-blk: base queue-depth on virtqueue ringsize or module param) Merging input/next (e2c3ecf0ea8e Input: edt-ft5x06 - add a missing condition) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (926912e06e3b Merge branch 'for-3.16/drivers' into for-next) Merging device-mapper/for-next (ec052772958d Merge branch 'for-3.15' into for-next) 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 (c67480173f72 mmc: sdhci-acpi: Intel SDIO has broken card detect) Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command) Merging slab/for-next (34bf6ef94a83 mm: slab/slub: use page->list consistently instead of page->lru) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (e2f23b606b94 md: avoid oops on unload if some process is in poll or select.) 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 (2d28ca731b9b mfd: wm5110: Correct default for HEADPHONE_DETECT_1) 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 (d754589d8044 OMAPDSS: add missing __init for dss_init_ports) CONFLICT (rename/delete): drivers/video/fbdev/sgivwfb.c deleted in HEAD and renamed in omap_dss2/for-next. Version omap_dss2/for-next of drivers/video/fbdev/sgivwfb.c left in tree. CONFLICT (content): Merge conflict in drivers/video/Makefile CONFLICT (content): Merge conflict in drivers/video/Kconfig CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/gpu/drm/exynos/exynos_dp_reg.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.h"->"drivers/video/fbdev/exynos/exynos_dp_reg.h" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/gpu/drm/exynos/exynos_dp_reg.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_reg.c"->"drivers/video/fbdev/exynos/exynos_dp_reg.c" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/gpu/drm/exynos/exynos_dp_core.h" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.h"->"drivers/video/fbdev/exynos/exynos_dp_core.h" in "omap_dss2/for-next" CONFLICT (rename/rename): Rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/gpu/drm/exynos/exynos_dp_core.c" in branch "HEAD" rename "drivers/video/exynos/exynos_dp_core.c"->"drivers/video/fbdev/exynos/exynos_dp_core.c" in "omap_dss2/for-next" $ git rm -f drivers/video/fbdev/exynos/exynos_dp_core.c drivers/video/fbdev/exynos/exynos_dp_core.h drivers/video/fbdev/exynos/exynos_dp_reg.c drivers/video/fbdev/exynos/exynos_dp_reg.h drivers/video/exynos/exynos_dp_core.c drivers/video/exynos/exynos_dp_core.h drivers/video/exynos/exynos_dp_reg.c drivers/video/exynos/exynos_dp_reg.h $ git rm -f drivers/video/fbdev/sgivwfb.c Applying: video: fbdev: fix up fro removal of SGI Visual Workstation Applying: video: imxfb: Select LCD_CLASS_DEVICE unconditionally - fix Merging regulator/for-next (053ed78e189f Merge remote-tracking branches 'regulator/topic/axp20', 'regulator/topic/of', 'regulator/topic/pbias', 'regulator/topic/s2mps11' and 'regulator/topic/s5m8767' into regulator-next) Merging security/next (fab71a90edda security: Convert use of typedef ctl_table to struct ctl_table) Merging selinux/next (6d32c850621b Merge tag 'v3.14' into next) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (c9eaa447e77e Linux 3.15-rc1) Merging iommu/next (e172b8122254 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'arm/omap', 'arm/shmobile' and 'x86/vt-d' into next) Merging dwmw2-iommu/master (5ae0566a0fff iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors) Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES) Merging osd/linux-next (f1f6630b53e7 MAINTAINERS: Update email address for bhalevy) Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) Merging trivial/for-next (c800bcd5f53f sparse: fix comment) Merging audit/master (4daa06f4d8b0 syscall.h: fix doc text for syscall_get_arch()) CONFLICT (content): Merge conflict in kernel/audit.c CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (d88cf7d7b424 Merge remote-tracking branch 'robh/for-next' into devicetree/next) Merging dt-rh/for-next (e7a62df8e8b4 of: Clean up of_update_property) Merging spi/for-next (5db6f05a77a0 Merge remote-tracking branches 'spi/topic/s3c24xx', 'spi/topic/sirf' and 'spi/topic/workqueue' into spi-next) Merging tip/auto-latest (7b8bfcc693cf Merge branch 'x86/vdso') Merging clockevents/clockevents/next (09e15176ded1 clocksource: exynos_mct: silence a static checker warning) Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG) Merging edac-amd/for-next (c045ebdf6079 Merge branch 'edac-for-3.15' into for-next) Merging ftrace/for-next (17a280ea8111 tracing: Add missing function triggers dump and cpudump to README) Merging rcu/rcu/next (765a3f4fed70 rcu: Provide grace-period piggybacking API) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (0f689a33ad17 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) 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 (7227fc066660 Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next) 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 (0a25e113b480 Merge branch 'devel/for-linus-3.15' into linux-next) Merging percpu/for-next (4abee313c9a8 Merge branch 'for-3.16' into for-next) Merging workqueues/for-next (77f300b198f9 workqueue: fix bugs in wq_update_unbound_numa() failure path) Merging drivers-x86/linux-next (7a70906e55bf alienware-wmi: cover some scenarios where memory allocations would fail) 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 (b94f4fe06dd8 Merge remote-tracking branches 'regmap/topic/le', 'regmap/topic/mmio' and 'regmap/topic/rbtree' into regmap-next) Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (95d33e9fcc7e leds: leds-pwm: add DT support for LEDs wired to supply) Merging driver-core/driver-core-next (c9eaa447e77e Linux 3.15-rc1) Merging tty/tty-next (c9eaa447e77e Linux 3.15-rc1) Merging usb/usb-next (c9eaa447e77e Linux 3.15-rc1) Merging usb-gadget/next (c9eaa447e77e Linux 3.15-rc1) Merging staging/staging-next (dff222670ebe staging: rtl8723au: Make _rtw_free_network23() static) CONFLICT (content): Merge conflict in drivers/staging/rtl8723au/core/rtw_wlan_util.c CONFLICT (modify/delete): drivers/staging/rtl8723au/core/rtw_p2p.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8723au/core/rtw_p2p.c left in tree. CONFLICT (content): Merge conflict in drivers/staging/rtl8723au/core/rtw_mlme_ext.c CONFLICT (content): Merge conflict in drivers/staging/rtl8723au/core/rtw_ieee80211.c $ git rm -f drivers/staging/rtl8723au/core/rtw_p2p.c Merging char-misc/char-misc-next (c9eaa447e77e Linux 3.15-rc1) Merging cgroup/for-next (49957f8e2a43 cgroup: newly created dirs and files should be owned by the creator) Merging scsi/for-next (b908a5a97b7f [SCSI] hpsa: fix NULL dereference in hpsa_put_ctlr_into_performant_mode()) Merging target-updates/for-next (b076808051f2 ib_srpt: Use correct ib_sg_dma primitives) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) 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 (cc17609e1855 Merge branch 'devel' into for-next) Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak) Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (da150898c982 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (68efd7d2fb32 arm: dma-mapping: remove order parameter from arm_iommu_create_mapping()) Merging pwm/for-next (2ae69a460413 pwm: pxa: Constify OF match table) Merging dma-buf/for-next (dcb99fd9b08c Linux 3.14-rc7) Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files) CONFLICT (content): Merge conflict in fs/namespace.c CONFLICT (content): Merge conflict in fs/namei.c CONFLICT (content): Merge conflict in fs/dcache.c $ git reset --hard HEAD^ Merging ktest/for-next (62183dcac539 ktest: Set CLOSE_CONSOLE_SIGNAL in the kvm.conf) 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 (31c2c4b8e911 clk: bcm281xx: don't use unnamed structs or unions) Merging random/dev (7b878d4b48c4 random: Add arch_has_random[_seed]()) 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 (e02ba72aabfa aio: block io_destroy() until all context requests are completed) Merging llvmlinux/for-next (40e9963e622c Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) Merging rd-docs/master (596d80c7ceb6 The sample wrapper currently fails on some Java 7 .class files. This updates the wrapper to properly handle those files.) Merging akpm-current/current (7b5f689823ab lib/scatterlist: clean up useless architecture versions of scatterlist.h) $ git am -3 ../patches/0001-Revert-x86-define-_PAGE_NUMA-by-reusing-software-bit.patch Applying: Revert "x86: define _PAGE_NUMA by reusing software bits on the PMD and PTE levels -fix" $ git am -3 ../patches/0002-Revert-x86-define-_PAGE_NUMA-by-reusing-software-bit.patch Applying: Revert "x86: define _PAGE_NUMA by reusing software bits on the PMD and PTE levels" $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: arm: move arm_dma_limit to setup_dma_zone Applying: ufs: sb mutex merge + mutex_destroy Applying: mm: add strictlimit knob Merging akpm/master (4c3d768413b4 mm: add strictlimit knob)
Attachment:
pgpENWQ9fpZIv.pgp
Description: PGP signature
