Hi all, Changes since 20141030: The hid tree gained a conflict against Linus' tree. The akpm-current tree lost its build failure. Non-merge commits (relative to Linus' tree): 3051 2487 files changed, 79125 insertions(+), 103302 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" and checkout or reset to the new master. 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 227 trees (counting Linus' and 32 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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (3a2f22b7d0cc Merge tag 'fbdev-fixes-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()) Merging m68k-current/for-linus (f7bbd12a4b7e m68k: Wire up bpf) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) Merging powerpc-merge-mpe/fixes (2c0a33f9861d powerpc/numa: ensure per-cpu NUMA mappings are correct on topology update) Merging sparc/master (c20ce79303c7 sparc: Hook up bpf system call.) Merging net/master (e327c225c911 cxgb4 : Fix missing initialization of win0_lock) Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes') Merging sound-current/for-linus (1df8874bfab1 ALSA: hda/realtek - Update Initial AMP for EAPD control) Merging pci-current/for-linus (d8e7d53a2fc1 PCI: Rename sysfs 'enabled' file back to 'enable') Merging wireless/master (75a916e1944f rtlwifi: rtl8192se: Fix firmware loading) Merging driver-core.current/driver-core-linus (cac7f2429872 Linux 3.18-rc2) Merging tty.current/tty-linus (cac7f2429872 Linux 3.18-rc2) Merging usb.current/usb-linus (9c19db5b1148 Merge tag 'usb-serial-3.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-gadget-fixes/fixes (9599815de61d usb: dwc2: gadget: fix enumeration issues) Merging usb-serial-fixes/usb-linus (7f2719f0003d usb: serial: ftdi_sio: add "bricked" FTDI device PID) Merging staging.current/staging-linus (238b5ad85592 staging: comedi: fix memory leak / bad pointer freeing for chanlist) Merging char-misc.current/char-misc-linus (cac7f2429872 Linux 3.18-rc2) Merging input-current/for-linus (185af4d6668e Input: psmouse - remove unneeded check in psmouse_reconnect()) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (09adc8789c4e crypto: qat - Enforce valid numa configuration) Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (e66c98c7a0ea of: Fix NULL dereference in selftest removal code) Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to remove the device) 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 kselftest-fixes/fixes (ce6a144a0d01 selftests/memfd: Run test on all architectures) Merging drm-intel-fixes/for-linux-next-fixes (7809a61176b3 drm/i915/dp: only use training pattern 3 on platforms that support it) Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all boot code paths") Merging arc/for-next (21d2271fd081 Merge git://www.linux-watchdog.org/linux-watchdog) Merging arm/for-next (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn()) Merging arm-perf/for-next/perf (af66abfe2ec8 arm: perf: fold hotplug notifier into arm_pmu) Merging arm-soc/for-next (4ec9a68dd832 Merge branch 'fixes' into for-next) Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) Merging berlin/berlin/for-next (bb3adf0f4627 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 (809d4af84856 Merge branch 'imx/dt' into for-next) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (39179cb5b789 soc: ti: knav_qmss_queue: Return proper error if devm_kzalloc fails) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (65a3bb88bb33 Merge branch 'mvebu/dt' into mvebu/for-next) Merging renesas/next (1c43133a8125 Merge branches 'heads/dt-cleanups-for-v3.19', 'heads/dt-clocksource-for-v3.19', 'heads/kconfig-cleanups-for-v3.19', 'heads/clocks-for-v3.19' and 'heads/runtime-pm-for-v3.19' into next) Merging samsung/for-next (5d184e4fb69a Merge branch 'v3.19-next/pm-samsung-2' into for-next) Merging sunxi/sunxi/for-next (6d791644b46e Merge branches 'sunxi/dt-for-3.19' and 'sunxi/clocks-for-3.19' into sunxi/for-next) Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next) Merging arm64/for-next/core (0a6479b0ffad arm64: Remove unneeded extern keyword) Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD) Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) Merging ia64/next (0f33be009b89 Linux 3.17-rc6) Merging m68k/for-next (bcf8eb09b564 nubus: Remove superfluous interrupt disable/restore) Merging m68knommu/for-next (e803d4bd3118 m68k: Fix typo 'COFNIG_MBAR') Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (802f4db7e2e7 microblaze: Wire up bpf syscall) Merging mips/mips-for-linux-next (2f2a6e421b36 Merge branch '3.18-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 (5e40d331bd72 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging powerpc-mpe/next (c3351dfabf5c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending) Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs") Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (aae53dbb795e s390/cmpxchg: use compiler builtins) Merging sparc-next/master (61ed53deb1c6 Merge tag 'ntb-3.18' of git://github.com/jonmason/ntb) Merging tile/master (78410af51146 tile: add clock_gettime support to vDSO) Merging uml/next (989e59fa41c5 um: Include generic barrier.h) CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (66acb0216d5a Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next) Merging btrfs/next (a43bb39b5c71 btrfs: Fix compile error when CONFIG_SECURITY is not set.) Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len) Merging cifs/for-next (6212096bb0a1 [CIFS] Update modinfo cifs version for cifs.ko) 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 (831115af5ca3 eCryptfs: Remove unnecessary casts when parsing packet lengths) Merging ext3/for_next (3c9cafe05ff0 fs, jbd: use a more generic hash function) Merging ext4/dev (ae9e9c6aeea6 ext4: make ext4_ext_convert_to_initialized() return proper number of blocks) Merging f2fs/dev (7084c08ad0a5 f2fs: revisit inline_data to avoid data races and potential bugs) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) CONFLICT (content): Merge conflict in fs/fscache/object.c Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) Merging gfs2/master (bd2614983dd7 GFS2: directly return gfs2_dir_check()) Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (cac7f2429872 Linux 3.18-rc2) Merging nfsd/nfsd-next (ccc6398ea5d5 nfsd: clean up comments over nfs4_file definition) 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 (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) Merging ubifs/linux-next (91401a34038e UBI: Fastmap: Calc fastmap size correctly) Merging xfs/for-next (5d11fb4b9a1d xfs: rework zero range to prevent invalid i_size updates) Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING) Merging vfs/for-next (5b71ecfa7827 isofs: don't bother with ->d_op for normal case) Merging pci/next (f114040e3ea6 Linux 3.18-rc1) Merging hid/for-next (caea70479faa Merge branch 'for-3.19/upstream' into for-next) CONFLICT (content): Merge conflict in drivers/hid/hid-input.c Merging i2c/i2c/for-next (f114040e3ea6 Linux 3.18-rc1) Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro) Merging hwmon-staging/hwmon-next (2b46da7d6abc hwmon: (iio_hwmon) Add support for humidity sensors) Merging v4l-dvb/master (7a7f1ab37dc8 [media] v4l2-ctrls: fix sparse warning) Merging kbuild/for-next (e9f717fb534c Merge branch 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (e35b98849f25 ata: sata_rcar: Add r8a7793 device support) Merging pm/linux-next (fbb20504c3be Merge branch 'device-properties' into linux-next) Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format) Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (6ceaf58abe25 Merge branch 'int340x-thermal' of .git into next) Merging thermal-soc/next (df67e40f5139 thermal: fix multiple disbalanced device node counters) Merging ieee1394/for-next (19583ca584d6 Linux 3.16) Merging dlm/next (c07127b48c63 dlm: fix missing endian conversion of rcom_status flags) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) Merging slave-dma/next (f114040e3ea6 Linux 3.18-rc1) Merging net-next/master (676104962940 r8152: set RTL8152_UNPLUG when finding -ENODEV) CONFLICT (content): Merge conflict in drivers/net/phy/marvell.c Merging ipsec-next/master (5c1e9f2c1ff7 xfrm: fix set but not used warning in xfrm_policy_queue_process()) Merging wireless-next/master (09fa9d87cace rtlwifi: rtl8821ae: Remove extra semicolons) Merging bluetooth/master (a4d5504d5c39 Bluetooth: Clear LE white list when resetting controller) Merging infiniband/for-next (7b909bb49ac2 Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next) Merging mtd/master (8b3d58e55445 mtd: nand: omap: Correct CONFIG_MTD_NAND_OMAP_BCH help message) Merging l2-mtd/master (1f04a73e2c63 MTD: merge 3.18 development into -next development) Merging crypto/master (bac68f2c9a43 crypto: caam - add support for rfc4106(gcm(aes))) Merging drm/drm-next (bbf0ef0334f2 Merge tag 'drm-intel-next-2014-10-03-no-ppgtt' of git://anongit.freedesktop.org/drm-intel into drm-next) Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1) Merging drm-intel/for-linux-next (421d82916774 drm/i915: use intel_fb_obj() macros to assign gem objects) Merging drm-tegra/drm/tegra/for-next (8ed05f485498 drm/tegra: Depend on COMMON_CLK) Merging drm-misc/topic/core-stuff (5a1cbdb0fb67 gpu: drm: Fix warning caused by a parameter description in drm_crtc.c) Merging sound/for-next (ce40a6d3ad2a Merge branch 'topic/kerneldoc' into for-next) Merging sound-asoc/for-next (b76ae9b1ff44 Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/wm8731' and 'asoc/topic/wm8962' into asoc-next) Merging modules/modules-next (d3051b489aa8 modules, lock around setting of MODULE_STATE_UNFORMED) Merging virtio/virtio-next (1bbc26062754 virtio-rng: refactor probe error handling) Merging input/next (6696777c6506 Input: add driver for Elan I2C/SMbus touchpad) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (4ffdb8cb7e3f Merge branch 'for-3.19/core' into for-next) Merging device-mapper/for-next (fedead108c55 Merge branch 'dm-for-3.19' 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 (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (b6d25a26654e mmc: sdhci-pxav3: Document clocks and additional clock-names property) Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (b395f75eabb3 lib/raid6: Add log level to printks) Merging mfd/for-mfd-next (645d10214b28 mfd: tps65910: Convert ti,system-power-controller DT property to poweroff-source) Merging backlight/for-backlight-next (b6af73b42219 backlight: omap1: add blank line after declarations) Merging battery/master (cdaf3e15385d power: charger-manager: Fix accessing invalidated power supply after charger unbind) 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 (f114040e3ea6 Linux 3.18-rc1) Merging regulator/for-next (dca7698d3bb0 Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/sky81452', 'regulator/topic/stub' and 'regulator/topic/suspend' into regulator-next) Merging security/next (594081ee7145 integrity: do zero padding of the key id) Merging integrity/next (1b68bdf9cded ima: detect violations for mmaped files) Merging selinux/next (4093a8443941 selinux: normalize audit log formatting) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (8ae1a57f54af watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7) CONFLICT (content): Merge conflict in drivers/watchdog/s3c2410_wdt.c Merging iommu/next (f34b4fa45e28 Merge branches 'arm/omap' and 'arm/msm' into next) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (93899a679fd6 vfio-pci: Fix remove path locking) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (d75ef707ea5e Documentation/SubmittingPatches: Reported-by tags and permission) Merging trivial/for-next (be278e980d95 clocksource: Fix 'clcoksource' typo in comment) Merging audit/next (915f389d9c52 audit: add Paul Moore to the MAINTAINERS entry) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (2118f4b8dfc6 of/selftest: Move hash table off stack to fix large frame size) Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea) Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) Merging spi/for-next (de0f1a323318 Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/dw' and 'spi/topic/fsl-dspi' into spi-next) Merging tip/auto-latest (ebb9f164eeea Merge branch 'x86/vdso') Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic) Merging edac/linux_next (d0585cd815fa sb_edac: Claim a different PCI device) Merging edac-amd/for-next (a597d2a5d982 amd64_edac: Add F15h M60h support) Merging irqchip/irqchip/for-next (3bbccffba8d5 Merge branch 'irqchip/core' into irqchip/for-next) Merging tiny/tiny/next (d45461ff03ad Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next) Merging ftrace/for-next (70c738a64478 Merge branch 'trace/ftrace/testing' into trace/for-next) Merging rcu/rcu/next (f120000b06ab Merge branch 'torture.2014.10.28d' into HEAD) CONFLICT (content): Merge conflict in drivers/md/dm.c Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (f62c95fd4041 Merge tag 'kvm-s390-next-20141028' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-arm/next (f62c95fd4041 Merge tag 'kvm-s390-next-20141028' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst) 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 (63401a5dca18 Merge branch 'hypercall_cache_flush_v5' into xentip-linux-next-7) Merging percpu/for-next (56e4dea81a55 percpu: Convert remaining __get_cpu_var uses in 3.18-rcX) Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()) Merging drivers-x86/for-next (725c7f619e20 quirk for Lenovo Yoga 3: no rfkill switch) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) Merging regmap/for-next (46f6c620e8a1 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/headers' into regmap-next) Merging hsi/for-next (a26a42508157 HSI: remove deprecated IRQF_DISABLED) Merging leds/for-next (a4c84e6aafda leds: gpio: cleanup the leds-gpio driver) Merging ipmi/for-next (ef4a48c51321 Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux) Merging driver-core/driver-core-next (cac7f2429872 Linux 3.18-rc2) Merging tty/tty-next (cac7f2429872 Linux 3.18-rc2) Merging usb/usb-next (cac7f2429872 Linux 3.18-rc2) Merging usb-gadget/next (72a65a0d19c1 Revert "usb: gadget: composite: dequeue cdev->req before free its buffer") Merging usb-serial/usb-next (5f9f975b7984 USB: serial: keyspan_pda: fix Entrega company name spelling) Merging staging/staging-next (16fc54ee2691 staging, rtl8192e, LLVMLinux: Make static local in inline function const) Merging char-misc/char-misc-next (cac7f2429872 Linux 3.18-rc2) Merging cgroup/for-next (cea74465e27b cpuset: lock vs unlock typo) Merging scsi/for-next (905747d49c71 Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-next) Merging target-updates/for-next (cac7f2429872 Linux 3.18-rc2) 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 (f26e1f39b590 Merge branch 'devel' into for-next) Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) CONFLICT (content): Merge conflict in drivers/vhost/net.c Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) Merging gpio/for-next (2071d0968e56 Documentation: gpio: guidelines for bindings) Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) Merging pwm/for-next (e2e08970100d pwm: atmel: Fix calculation of prescale value) Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry) CONFLICT (content): Merge conflict in fs/nfs/client.c Merging ktest/for-next (d832d743385d ktest: Don't bother with bisect good or bad on replay) 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 (98d147f50eb0 clk: pxa clocks build system fix) Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging aio/master (668044a5d632 aio: Make it possible to remap aio ring) Merging llvmlinux/for-next (ec25a590c29c arm: LLVMLinux: Use global stack register variable for percpu) Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL) Merging kselftest/next (49296470830a selftests/timers: change test to use ksft framework) Merging y2038/y2038 (3b34d3a706f5 PM / Hibernate: Migrate to ktime_t) Merging akpm-current/current (bf74244c073d ipc-msg-increase-msgmni-remove-scaling-checkpatch-fixes) CONFLICT (content): Merge conflict in mm/memcontrol.c CONFLICT (content): Merge conflict in kernel/kmod.c CONFLICT (content): Merge conflict in kernel/gcov/Kconfig $ git am -3 ../patches/0001-Revert-lib-show_mem-this-patch-adds-cma-reserved-inf.patch Applying: Revert "lib-show_mem-this-patch-adds-cma-reserved-infromation-fix" $ git am -3 ../patches/0002-Revert-lib-show_mem.c-adds-cma-reserved-information.patch Applying: Revert "lib/show_mem.c: adds cma reserved information" $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: arch/x86/vdso/vma.c: fix build with older gcc Applying: slab: fix cpuset check in fallback_alloc Applying: slub: fix cpuset check in get_any_partial Applying: mm/cma: make kmemleak ignore CMA regions Applying: mm: cma: split cma-reserved in dmesg log Applying: fs: proc: include cma info in proc/meminfo Applying: mm: replace remap_file_pages() syscall with emulation Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (13493c8fb5cb mm: add strictlimit knob) Applying: lib/show_mem.c: adds cma reserved information Applying: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix
Attachment:
pgpCd5UjVeMla.pgp
Description: OpenPGP digital signature
