Hi all, Changes since 20140919: The fsl tree lost its build failure. The net-next tree gained a conflict against the net tree. The tip tree gained a conflict against the nfs tree. The kvm-arm tree gained a build failure so I used the version from next-20140919. The staging tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 6308 5635 files changed, 225070 insertions(+), 131524 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 225 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 (0f33be009b89 Linux 3.17-rc6) Merging fixes/master (23cf8d3ca0fd powerpc: Fix "attempt to move .org backwards" error) Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1) Merging arc-current/for-curr (55d65081ef2a ARC: [nsimosci] Allow "headless" models to boot) Merging arm-current/fixes (505013bc9065 ARM: 8149/1: perf: Don't sleep while atomic when enabling per-cpu interrupts) Merging m68k-current/for-linus (4ed7800987b1 m68k: Wire up memfd_create) 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/for-linus (7d59deb50aaf powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create()) Merging sparc/master (c21c4ab0d692 sparc64: Move request_irq() from ldc_bind() to ldc_alloc()) Merging net/master (afbe7af1b22f Merge tag 'linux-can-fixes-for-3.17-20140918' of git://gitorious.org/linux-can/linux-can) Merging ipsec/master (b8c203b2d2fc xfrm: Generate queueing routes only from route lookup functions) Merging sound-current/for-linus (8245b3634516 ALSA: hda - Add fixup model name lookup for Lemote A1205) Merging pci-current/for-linus (12d8706963f0 Revert "PCI: Make sure bus number resources stay within their parents bounds") Merging wireless/master (dda3b191eb6c net: rfkill: gpio: Enable module auto-loading for ACPI based switches) Merging driver-core.current/driver-core-linus (9e82bf014195 Linux 3.17-rc5) Merging tty.current/tty-linus (9e82bf014195 Linux 3.17-rc5) Merging usb.current/usb-linus (c80b4495c616 USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters) Merging usb-gadget-fixes/fixes (0b93a4c838fa usb: dwc3: fix TRB completion when multiple TRBs are started) Merging usb-serial-fixes/usb-linus (9e82bf014195 Linux 3.17-rc5) Merging staging.current/staging-linus (ed87c2b2e7dd staging: vt6655: buffer overflow in ioctl) Merging char-misc.current/char-misc-linus (9e82bf014195 Linux 3.17-rc5) Merging input-current/for-linus (807362cd960d Input: atmel_mxt_ts - fix merge in DT documentation) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (413e55742a4f crypto: qat - Enable all 32 IRQs) Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function) 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 (8c875fca1a8d drm/i915: Add limited color range readout for HDMI/DP ports on g4x/vlv/chv) Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) Merging arc/for-next (2a5e95d4181c mm, arc: remove obsolete pagefault oom killer comment) Merging arm/for-next (18cdbcb74636 Merge branches 'fiq' (early part), 'fixes' and 'misc' into for-next) Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1) Merging arm-soc/for-next (37bd1119d8b2 arm-soc: document merges) Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) Merging berlin/berlin/for-next (8d4f3361e05c 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 (2b2244a3e7c3 ARM: dts: imx6: make gpt per clock can be from OSC) Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) 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 (cc38f02b87ef Merge branches 'heads/dt-for-v3.18' and 'heads/soc-for-v3.18' into next) Merging samsung/for-next (7e8312325343 Merge branch 'v3.18-next/cleanup-samsung' into for-next) Merging sunxi/sunxi/for-next (429823087fec Merge branches 'sunxi/dt-for-3.18' and 'sunxi/drivers-for-3.18' into sunxi/for-next) Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next) Merging arm64/for-next/core (9f1ae7596aad arm64: Correct ftrace calls to aarch64_insn_gen_branch_imm()) CONFLICT (content): Merge conflict in Documentation/networking/filter.txt 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 (cd065a010a97 CRISv10: Readd missing header) Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) Merging ia64/next (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers) Merging m68k/for-next (9aa59cacdf22 m68k/atari - stram: Add missing #include <linux/ioport.h>) Merging m68knommu/for-next (a5e888d67bd4 m68k/coldfire: remove second asm/mcfclk.h inclusion in m54xx.c) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (554336c714f4 microblaze: Use empty asm-generic/linkage.h) Merging mips/mips-for-linux-next (b0f975c34d69 Merge branch '3.17-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 (c735483de1a2 parisc: pdc_stable.c: Avoid potential stack overflows) Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs") Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) Merging s390/features (49d3ea4b7a5d s390/hmcdrv: HMC drive CD/DVD access) Merging sparc-next/master (619df5d2870b Merge tag 'microblaze-3.17-rc5' of git://git.monstr.eu/linux-2.6-microblaze) Merging tile/master (9c29b2aea7fa tile gxio: use better string copy primitive) 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 (f2589bff1ce8 xtensa/uapi: Add definition of TIOC[SG]RS485) Merging btrfs/next (8d875f95da43 btrfs: disable strict file flushes for renames and truncates) Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len) Merging cifs/for-next (8cb4fb2da42f mfsymlinks support for SMB2.1/SMB3. Part 2 query symlink) 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 (04ec5f5c0022 ecryptfs: remove unnecessary break after goto) Merging ext3/for_next (52362810bec8 ocfs2: Don't use MAXQUOTAS value) Merging ext4/dev (279bf6d39093 ext4: don't check quota format when there are no quota files) Merging f2fs/dev (4e423b220509 f2fs: use more free segments until SSR is activated) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) Merging gfs2/master (00a158be8383 GFS2: fix bad inode i_goal values during block allocation) 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 (5466112f0935 pnfs/blocklayout: Fix a 64-bit division/remainder issue in bl_map_stripe) Merging nfsd/nfsd-next (9d137dc5a4cb NFSD: Implement SEEK) 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 (7fbbd0579997 UBI: return on error in rename_volumes()) Merging xfs/for-next (a4241aebe924 Merge branch 'xfs-misc-fixes-for-3.18-1' into for-next) Merging file-locks/linux-next (b0dd1b52742a locks: flock_make_lock should return a struct file_lock (or PTR_ERR)) CONFLICT (content): Merge conflict in fs/locks.c Merging vfs/for-next (bb4623448d40 vfs: move getname() from callers to do_mount()) Merging pci/next (a2351efeb3b4 Merge branches 'pci/misc', 'pci/pm', 'pci/host-designware', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-tegra' and 'pci/host-xilinx' into next) Merging hid/for-next (f73b5bcf1024 Merge branch 'for-3.18/sony' into for-next) Merging i2c/i2c/for-next (2ce7598c9a45 Linux 3.17-rc4) Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) Merging hwmon-staging/hwmon-next (ac407362ee6f hwmon: (ntc_thermistor) Add ntc thermistor to thermal subsystem as a sensor.) Merging v4l-dvb/master (cc0354cc0f43 Merge branch 'topic/devel' into to_next) Merging kbuild/for-next (04d29c44a5c9 Merge branch 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (9b8a2d2b9a97 Merge branch 'for-3.17-fixes' into for-next) Merging pm/linux-next (29a4599c5988 Merge branch 'pm-cpufreq-next' into linux-next) CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ape6evm-reference.c CONFLICT (content): Merge conflict in arch/arm/configs/mvebu_v7_defconfig 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 (dd634666793e Merge branches 'eduardo-soc' and 'bang-bang-governor' of .git into next) Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) Merging slave-dma/next (40515197569b Merge branch 'for-linus' into next) Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) Merging net-next/master (6d967f878924 udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected) CONFLICT (content): Merge conflict in drivers/net/can/flexcan.c CONFLICT (content): Merge conflict in arch/mips/net/bpf_jit.c CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188-radxarock.dts Merging ipsec-next/master (689f1c9de2ab ipsec: Remove obsolete MAX_AH_AUTH_LEN) Merging wireless-next/master (7a0a260a0f6f ath9k: enable ext channel pulse detection) Merging bluetooth/master (5eb596f55cac Bluetooth: Fix setting correct security level when initiating SMP) Merging infiniband/for-next (80452e4823d7 Merge branches 'core', 'ipoib', 'mlx4', 'ocrdma' and 'qib' into for-next) Merging mtd/master (b25046b1e5e3 mtd: nand: fix DocBook warnings on nand_sdr_timings doc) Merging l2-mtd/master (ab95eac99c17 MAINTAINERS: add l2-mtd.git, 'next' tree for MTD) Merging crypto/master (383b75e9d05c crypto: qat - Removed unneeded partial state) Merging drm/drm-next (8337486a8fda Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next) Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1) Merging drm-intel/for-linux-next (bda0381e7202 drm/i915: Use EIO instead of EAGAIN for sink CRC error.) Merging drm-tegra/drm/tegra/for-next (7d1311b93e58 Linux 3.17-rc1) Merging sound/for-next (8bb1ffdf7627 ALSA: hda - Replace strnicmp with strncasecmp) Merging sound-asoc/for-next (422cc820ce5a Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next) Merging modules/modules-next (184c3fc3f52f moduleparam: Resolve missing-field-initializer warning) Merging virtio/virtio-next (7ec62d421bdf Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) Merging input/next (05f7588c3c16 Input: palmas-pwrbutton - fix typo in the license string) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (c34ecd696186 Merge branch 'for-linus' into for-next) Merging device-mapper/for-next (bf6ee77f38b0 dm crypt: sort writes) 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 (bb98d9d1d2e7 mmc: tmio: prevent endless loop in tmio_mmc_set_clock()) 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 (69db76ce6b94 md/bitmap: remove bev_logical_block_size rounding where not needed.) Merging mfd/for-mfd-next (420795acbd11 mfd: twl4030-power: Use 'ti,system-power-controller' as alternative way to support system power off) Merging backlight/for-backlight-next (b6af73b42219 backlight: omap1: add blank line after declarations) Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning) 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 (30296f61159e video: fbdev: use %*ph specifier to dump small buffers) Merging regulator/for-next (851a3105bafc Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65910' and 'regulator/topic/voltage-ev' into regulator-next) Merging security/next (6f98e892884c Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel into next) CONFLICT (content): Merge conflict in security/smack/smack_lsm.c CONFLICT (content): Merge conflict in fs/nfsd/vfs.c Merging integrity/next (1b68bdf9cded ima: detect violations for mmaped files) Merging selinux/next (cbe0d6e8794f selinux: make the netif cache namespace aware) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (9e82bf014195 Linux 3.17-rc5) Merging iommu/next (f55c86642759 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/omap', 'x86/vt-d' and 'x86/amd' into next) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (9b936c960f22 drivers/vfio: Enable VFIO if EEH is not supported) Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) Merging trivial/for-next (00703e0b7990 Documentation: remove obsolete pcmcia-cs from Changes) CONFLICT (content): Merge conflict in block/blk-core.c Merging audit/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (a9ecdc0fdc54 of/irq: Fix lookup to use 'interrupts-extended' property first) Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root) Merging mailbox/mailbox-for-next (29de0a1d6aa4 dt: mailbox: add generic bindings) Merging spi/for-next (8fb794ce36bc Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) Merging tip/auto-latest (ad9bed2b6aca Merge branch 'x86/uv') CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdm.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blocklayout/blocklayoutdm.c left in tree. CONFLICT (modify/delete): fs/nfs/blocklayout/blocklayoutdev.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of fs/nfs/blocklayout/blocklayoutdev.c left in tree. $ git rm -f fs/nfs/blocklayout/blocklayoutdev.c fs/nfs/blocklayout/blocklayoutdm.c Applying: pnfs: merge fixup for sched cleanup of set_current_state(TASK_RUNNING) Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems) Merging edac-amd/for-next (2d34056d2768 ppc4xx_edac: Fix build error caused by wrong member access) Merging irqchip/irqchip/for-next (1633cd9aed67 Merge branch 'irqchip/gic' into irqchip/for-next) Merging ftrace/for-next (3ddee63a099e ftrace: Only disable ftrace_enabled to test buffer in selftest) Merging rcu/rcu/next (dd56af42bd82 rcu: Eliminate deadlock between CPU hotplug and expedited grace periods) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (f51770ed465e kvm: Make init_rmode_identity_map() return 0 on success.) Merging kvm-arm/next (a98f26f18380 arm/arm64: KVM: vgic: make number of irqs a configurable attribute) $ git reset --hard HEAD^ Merging next-20140919 version of kvm-arm CONFLICT (content): Merge conflict in virt/kvm/arm/vgic.c CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h [master a4923a0ffce9] next-20140919/kvm-arm Merging kvm-ppc/kvm-ppc-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD) 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 (59119fad2954 xen-scsifront: don't deadlock if the ring becomes full) Merging percpu/for-next (1c50cef2a855 Merge branch 'for-3.18' into for-next) CONFLICT (content): Merge conflict in fs/ext4/super.c Applying: percpu_counter: fix for ext4 updates Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()) Merging drivers-x86/for-next (aeaac098bd58 toshiba_acpi: fix and cleanup toshiba_kbd_bl_mode_store()) 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 (d2f4e339e74f Merge remote-tracking branch 'regmap/topic/cache' into regmap-next) Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()) Merging leds/for-next (3ef7de5304ed leds: Improve and export led_update_brightness) Merging ipmi/for-next (662d15871626 ipmi: Clear drvdata when interface is removed) Merging driver-core/driver-core-next (00e262fd8744 Documentation/sysfs-rules.txt: Add device attribute error code documentation) Merging tty/tty-next (93b887747179 tty: serial_mctrl_gpio: Fix COMPILE_TEST build for architectures with custom termios.h) Merging usb/usb-next (18f340f90e08 usb: dwc2: add T: line to MAINTAINERS showing Felipe's tree) CONFLICT (content): Merge conflict in drivers/usb/gadget/function/f_fs.c Merging usb-gadget/next (72a65a0d19c1 Revert "usb: gadget: composite: dequeue cdev->req before free its buffer") Merging usb-serial/usb-next (f8c0e057b489 USB: serial: remove zte_ev driver) Merging staging/staging-next (3f76a4ea5383 Staging: rtl8192e: Fix __constant_htons to htons style warning) CONFLICT (content): Merge conflict in drivers/iio/accel/bma180.c Merging char-misc/char-misc-next (9e82bf014195 Linux 3.17-rc5) Merging cgroup/for-next (4e1024b53102 Merge branch 'for-3.18' into for-next) Merging scsi/for-next (a36a9a7ea09e Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-next) Merging target-updates/for-next (c435285df112 target: fix unused shift in core_scsi3_pri_report_capabilities) 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 (25634a37eba6 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 (aaedb2f20ec2 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (b4bbb107d73b dma-mapping: Provide write-combine allocations) Merging pwm/for-next (70145f87139f pwm: Fix uninitialized warnings in pwm_get()) 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 (fee9d3e61d04 ktest: add ability to skip during BISECT_MANUAL) 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 (a52ae5a755d9 Merge branch 'clk-fixes' into clk-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt Merging random/dev (13aa93c70e71 random: add and use memzero_explicit() for clearing data) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging aio/master (7be141d05549 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging llvmlinux/for-next (7d4cd0ef629a arm64: LLVMLinux: Fix inline arm64 assembly for use with clang) CONFLICT (content): Merge conflict in Makefile Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states) Merging rd-docs/master (78cbcabd472b Documentation: disable vdso_test to avoid breakage with old glibc) CONFLICT (content): Merge conflict in Documentation/networking/timestamping/Makefile Merging kselftest/next (69e273c0b0a3 Linux 3.17-rc3) Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp()) CONFLICT (content): Merge conflict in arch/unicore32/kernel/signal.c Merging akpm-current/current (3c07507edced scripts/headers_install.sh: fix error handling) CONFLICT (content): Merge conflict in mm/mmap.c $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: x86, vdso: fix vdso2c's special_pages error checking Applying: include/linux: remove strict_strto* definitions Applying: lib / string_helpers: move documentation to c-file Applying: lib / string_helpers: refactoring the test suite Applying: lib / string_helpers: introduce string_escape_mem() Applying: lib-string_helpers-introduce-string_escape_mem-fix Applying: lib/vsprintf: add %*pE[achnops] format specifier Applying: lib-vsprintf-add-%pe-format-specifier-fix Applying: wireless: libertas: print esaped string via %*pE Applying: wireless: ipw2x00: print SSID via %*pE Applying: wireless: hostap: proc: print properly escaped SSID Applying: wireless-hostap-proc-print-properly-escaped-ssid-fix Applying: lib80211: remove unused print_ssid() Applying: staging: wlan-ng: use %*pEhp to print SN Applying: staging: rtl8192e: use %*pEn to escape buffer Applying: staging: rtl8192u: use %*pEn to escape buffer Applying: kernel/watchdog.c: control hard lockup detection default Applying: watchdog-control-hard-lockup-detection-default-fix Applying: watchdog, nmi: Fix compile issues on sparc Applying: kvm: ensure hard lockup detection is disabled by default Applying: kernel: add support for kernel restart handler call chain Applying: power/restart: call machine_restart instead of arm_pm_restart Applying: arm64: support restart through restart handler call chain Applying: arm: support restart through restart handler call chain Applying: watchdog: moxart: register restart handler with kernel restart handler Applying: watchdog: alim7101: register restart handler with kernel restart handler Applying: watchdog: sunxi: register restart handler with kernel restart handler Applying: arm/arm64: unexport restart handlers Applying: watchdog: s3c2410: add restart handler Applying: clk: samsung: register restart handlers for s3c2412 and s3c2443 Applying: clk: rockchip: add restart handler Applying: mm: replace remap_file_pages() syscall with emulation Applying: fat: add i_disksize to represent uninitialized size Applying: fat: add fat_fallocate operation Applying: fat: zero out seek range on _fat_get_block Applying: fat: fallback to buffered write in case of fallocated region on direct IO Applying: fat: permit to return phy block number by fibmap in fallocated region Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (688df5dc327f mm: add strictlimit knob)
Attachment:
signature.asc
Description: PGP signature
