Hi all, Changes since 20150123: The arm64 tree gained a conflict against Linus' tree. The net-next tree gained conflicts against the arm-soc and net trees. The drm-panel tree gained a conflict against the drm tree. The wireless-drivers-next tree gained a build failure for which I reverted a commit. The block tree gained conflicts against the vfs and Linus' trees. The clockevents tree gained a conflict against the arm tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 5237 4877 files changed, 200964 insertions(+), 94565 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 206 trees (counting Linus' and 30 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 (26bc420b59a3 Linux 3.19-rc6) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (909ba297beb5 ARM: 8292/1: mm: fix size rounding-down of arm_add_memory() function) Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat) 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 (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (0eb13208aa16 powerpc/powernv: Restore LPCR with LPCR_PECE1 cleared) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (03a605804bc4 Merge branch 's390') Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) Merging sound-current/for-linus (0767e95bb96d ALSA: seq-dummy: remove deadlock-causing events on close) Merging pci-current/for-linus (f175aa2c9f6c MAINTAINERS: Update Richard Zhu's email address) Merging wireless-drivers/master (e3f31175a3ee ath9k: fix race condition in irq processing during hardware reset) Merging driver-core.current/driver-core-linus (26bc420b59a3 Linux 3.19-rc6) Merging tty.current/tty-linus (ec6f34e5b552 Linux 3.19-rc5) Merging usb.current/usb-linus (e5dff0e80463 USB: Add OTG PET device to TPL) Merging usb-gadget-fixes/fixes (0df8fc37f6e4 usb: phy: never defer probe in non-OF case) Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console) Merging staging.current/staging-linus (41c9e95d641a MAINTAINERS: add Android driver entries) Merging char-misc.current/char-misc-linus (26713c812313 drivers/Kconfig: remove duplicate entry for soc) Merging input-current/for-linus (1d90d6d5522b Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857)) Merging crypto-current/master (3e14dcf7cb80 crypto: add missing crypto module aliases) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests) Merging rr-fixes/fixes (d5db139ab376 module: make module_refcount() a signed integer.) Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) Merging drm-intel-fixes/for-linux-next-fixes (6b96d705f3cf drm/i915: BDW Fix Halo PCI IDs marked as ULT.) Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) Merging arc/for-next (5840adceb962 arc: Remove unused prepare_to_copy()) Merging arm/for-next (292c11f80cc8 Merge branch 'devel-stable' into for-next) Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) Merging arm-soc/for-next (ca6ea38915a6 arm-soc: document merges) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging berlin/berlin/for-next (8553bf8fd181 Merge branch 'berlin/dt' into berlin/for-next) Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) Merging imx-mxs/for-next (395ae1400a35 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) Merging mvebu/for-next (cd3892730fbc Merge branch 'mvebu/defconfig' into mvebu/for-next) Merging omap/for-next (da27c2abefeb Merge branch 'omap-for-v3.20/fixes-not-urgent' into for-next) Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) Merging renesas/next (f99d8a90958c Merge branch 'heads/defconfig-fixes-for-v3.20' into next) Merging samsung/for-next (9b20e28716aa Merge branch 'v3.20-samsung-defconfig' into for-next) Merging sunxi/sunxi/for-next (16e8c17e18d6 Merge branch 'sunxi/clocks-for-3.20' into sunxi/for-next) Merging tegra/for-next (794345d409ad Merge branch for-3.20/arm64 into for-next) Merging arm64/for-next/core (33b36543df33 arm64: uapi: expose our struct ucontext to the uapi headers) CONFLICT (content): Merge conflict in arch/arm64/mm/dump.c 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 (79a8480adf0e CRIS: Fix missing NR_CPUS in menuconfig) Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) Merging ia64/next (a6b8978c54b7 pstore: Fix sprintf format specifier in pstore_dump()) Merging m68k/for-next (87511d09206d m68k/atari: Remove obsolete IRQ_TYPE_*) Merging m68knommu/for-next (8d84d4aaf311 arch: m68k: 68360: config: Remove unused function) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (51cae8bfe7dd microblaze: Remove generated *.dtb files from dts) Merging mips/mips-for-linux-next (86f9f1e287be Merge branch '3.19-fixes' into mips-for-linux-next) Merging nios2/nios2-next (d24c8163b755 nios2: fix kuser trampoline address) Merging parisc-hd/for-next (b2776bf7149b Linux 3.18) Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) Merging powerpc-mpe/next (62fa19d4b4fd cxl: Add ability to reset the card) Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (bdea1f1bb273 s390/zcrypt: Add support for new crypto express (CEX5S) adapter.) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (b9f705758a4f tile: enable sparse checks for get/put_user) Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function) Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) CONFLICT (content): Merge conflict in net/ceph/auth_x.c CONFLICT (content): Merge conflict in fs/ceph/super.h CONFLICT (content): Merge conflict in fs/ceph/super.c CONFLICT (content): Merge conflict in fs/ceph/snap.c Merging cifs/for-next (ca7df8e0bb2a Complete oplock break jobs before closing file handle) Merging ecryptfs/next (e7a823be2adc Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging ext3/for_next (a39427007e7c xfs: Remove some pointless quota checks) Merging ext4/dev (8675f58ed42b ext4: change to use setup_timer() instead of init_timer()) Merging f2fs/dev (c0d65e72f4d5 f2fs: use f2fs_radix_tree_insert to clean codes) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) CONFLICT (content): Merge conflict in fs/fscache/object.c Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT) Merging gfs2/master (45094a58b1f5 GFS2: Eliminate a nonsense goto) Merging jfs/jfs-next (e1f1fe798d2f jfs: get rid of homegrown endianness helpers) Merging nfs/linux-next (cf6726e2ee38 NFSv4: Deal with atomic upgrades of an existing delegation) Merging nfsd/nfsd-next (70789780f356 nfsd: default NFSv4.2 to on) Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir()) Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree()) Merging xfs/for-next (438c3c8d2bb9 Merge branch 'xfs-buf-type-fixes' into for-next) Merging file-locks/linux-next (8116bf4cb62d locks: update comments that refer to inode->i_flock) Merging vfs/for-next (2f8e319e73f4 target: rewrite fd_execute_write_same) Merging pci/next (75f30c3d9949 Merge branches 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-rcar' and 'pci/host-tegra' into next) Merging hid/for-next (5786cd773d19 Merge branch 'for-3.20/upstream' into for-next) Merging i2c/i2c/for-next (020614b83312 Merge branch 'i2c/for-current' into i2c/for-next) Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) Merging hwmon-staging/hwmon-next (9130880a1c2d hwmon: (jc42) Allow negative hysteresis temperatures) Merging v4l-dvb/master (a5f23e34da02 Merge branch 'v4l_for_linus' into to_next) Merging kbuild/for-next (5ea04a1a0860 Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (b2a6e50231ef Merge branch 'for-3.20' into for-next) Merging pm/linux-next (69b838b0f0c8 Merge branch 'pm-cpuidle' into linux-next) Merging idle/next (f7c0e22f2d14 Merge branch 'turbostat' into release) CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging thermal/next (f67744c4d91e Merge branch 'thermal-soc' of .git into next) Merging thermal-soc/next (1024cf8b0fcd thermal: exynos: Remove exynos_tmu_data.c file) Merging ieee1394/for-next (b625a825955e firewire: ohci: Remove unused function) Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) Merging slave-dma/next (409490076137 Merge branch 'for-linus' into next) Merging net-next/master (fe6a043c535a rhashtable: rhashtable_remove() must unlink in both tbl and future_tbl) CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih407-family.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3288.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6sx-sdb.dts Merging ipsec-next/master (78890ed75494 csiostor:fix sparse warnings) Merging wireless-drivers-next/master (c5ed1df781cb bcma: use standard bus scanning during early register) Merging bluetooth/master (dfb2fae7cd0a Bluetooth: Fix nested sleeps) Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next) Merging mtd/master (97bf6af1f928 Linux 3.19-rc1) Merging l2-mtd/master (240181fd0ffa mtd: nand: default bitflip-reporting threshold to 75% of correction strength) Merging crypto/master (db71f29a1c32 crypto: testmgr - mark rfc4106(gcm(aes)) as fips_allowed) Merging drm/drm-next (281d1bbd34b7 Merge remote-tracking branch 'origin/master' into drm-next) Merging drm-panel/drm/panel/for-next (c618c446adff Documentation: bridge: Add documentation for ps8622 DT properties) CONFLICT (content): Merge conflict in drivers/gpu/drm/bridge/Kconfig Merging drm-intel/for-linux-next (37ec63030b14 drm/i915: DRRS calls based on frontbuffer) Merging drm-tegra/drm/tegra/for-next (28dd241d37bd drm/tegra: Use correct relocation target offsets) Merging drm-misc/topic/core-stuff (b77037262511 drm/probe-helper: clamp unknown connector status in the poll work) Merging sound/for-next (1001fb810b12 ALSA: seq: increase the maximum number of queues) Merging sound-asoc/for-next (e5ee7f26bfe0 Merge remote-tracking branches 'asoc/topic/wm8804', 'asoc/topic/wm8960', 'asoc/topic/wm8988' and 'asoc/topic/xtfpga' into asoc-next) Merging modules/modules-next (97bf6af1f928 Linux 3.19-rc1) Merging virtio/virtio-next (76545f066d2a virtio_pci_modern: drop an unused function) Merging input/next (bb03bf3f8427 Input: elan_i2c - verify firmware signature applying it) Merging block/for-next (15340ab0842f Merge branch 'for-3.20/drivers' into for-next) CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c CONFLICT (content): Merge conflict in drivers/block/loop.c CONFLICT (content): Merge conflict in drivers/ata/libata-core.c Applying: libata: fix for move of sas tag allocation code Merging device-mapper/for-next (de4d822acd96 block: keep established cmd_flags when cloning into a blk-mq request) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (bd6c8706da3f mmc: mmci: Get rid of dead code in mmci_dma_setup) CONFLICT (content): Merge conflict in drivers/mmc/host/sunxi-mmc.c Merging kgdb/kgdb-next (c7d9ebf81c45 kdb: Fix off by one error in kdb_cpu()) Merging md/for-next (f851b60db0fd md: Check MD_RECOVERY_RUNNING as well as ->sync_thread.) Merging mfd/for-mfd-next (bb400d2120bd mfd: rtsx_usb: Defer autosuspend while card exists) Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem) Merging battery/master (7bae8f04818c power/reset: restart-poweroff: Remove arm dependencies) Merging omap_dss2/for-next (7efc436cd45c Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) Merging regulator/for-next (4311c370311a Merge remote-tracking branches 'regulator/topic/pfuze100', 'regulator/topic/rk808', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next) Merging security/next (961be7ef6963 tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device) Merging integrity/next (bfd33c4b4b1a MAINTAINERS: email update) Merging selinux/next (0307dadc924d selinux: add security in-core xattr support for pstore and debugfs) Merging lblnet/next (b2776bf7149b Linux 3.18) Merging watchdog/master (e0c3e00f4045 watchdog: drop owner assignment from platform_drivers) Merging iommu/next (9bbb0ea981e9 Merge branches 'arm/renesas' and 'core' into next) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (174236285cf8 Merge branch 'doc/sp-update' into docs-next) Merging trivial/for-next (edb0ec0725bb kexec, Kconfig: spell "architecture" properly) Merging audit/next (2fded7f44b8f audit: remove vestiges of vers_ops) Merging devicetree/devicetree/next (fca8ba4ee24d of/unittest: Remove obsolete code) Merging dt-rh/for-next (e94fbe607f8c dt-bindings: use isil prefix for Intersil in vendor-prefixes.txt) Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) Merging spi/for-next (0accdbe2d045 Merge remote-tracking branches 'spi/topic/sirf' and 'spi/topic/st-ssc' into spi-next) Merging tip/auto-latest (4692b98fe5dc Merge branch 'x86/ras') Merging clockevents/clockevents/next (eadfef47003f clocksource: Driver for Conexant Digicolor SoC timer) CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) Merging edac-amd/for-next (a4972b1b9a04 edac: i5100_edac: Remove unused i5100_recmema_dm_buf_id) Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type) Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) Merging ftrace/for-next (14a5ae40f0de tracing: Use IS_ERR() check for return value of tracing_init_dentry()) Merging rcu/rcu/next (0cf8c85d7791 rcu_tree: Avoid touching rnp->completed when a new GP is started) Merging kvm/linux-next (8fff5e374a2f Merge tag 'kvm-s390-next-20150122' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next) CONFLICT (content): Merge conflict in arch/arm64/kvm/Kconfig CONFLICT (content): Merge conflict in arch/arm/kvm/Kconfig Merging kvm-arm/next (4b990589952f KVM: Remove unused config symbol) Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) Merging kvms390/next (0eb135ff9f19 KVM: s390: remove redundant setting of interrupt type) Merging xen-tip/linux-next (2e917175e1ef xen: Speed up set_phys_to_machine() by using read-only mappings) Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) Merging workqueues/for-next (b5b3ab523e31 Merge branch 'for-3.19-fixes' into for-next) Merging drivers-x86/for-next (97bf6af1f928 Linux 3.19-rc1) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) Merging regmap/for-next (270ded427d7b Merge remote-tracking branch 'regmap/topic/core' into regmap-next) Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer) Merging leds/for-next (452bc149947b leds: leds-mc13783: Use of_get_child_by_name() instead of refcount hack) Merging ipmi/for-next (b942c653ae26 Merge tag 'trace-sh-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging driver-core/driver-core-next (26bc420b59a3 Linux 3.19-rc6) Merging tty/tty-next (61b6b7fbda1b Merge 3.19-rc5 into tty-next) Merging usb/usb-next (1cee6b8d0042 USB: host: ohci-at91: Fix wake-up support) Merging usb-gadget/next (d1fc4440d761 Merge tag 'v3.19-rc5' into next) Merging usb-serial/usb-next (3e264ffc831e USB: mos7840: remove unused code) Merging staging/staging-next (f049a526ad3d staging: sm7xxfb: fix alignment) Merging char-misc/char-misc-next (d8a60e000c95 Drivers: hv: vmbus: hv_process_timer_expiration() can be static) CONFLICT (content): Merge conflict in drivers/char/mem.c Merging cgroup/for-next (8abba61bcfd4 Merge branch 'for-3.19-fixes' into for-next) Merging scsi/for-next (7f258fb2288a Merge branch 'fixes' into for-next) Merging target-updates/for-next (ecc3f3edbfb6 ib_srpt: wait_for_completion_timeout does not return negative status) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging pinctrl/for-next (6c95dc562773 Merge branch 'devel' into for-next) Merging vhost/linux-next (eaa27f34e91a linux 3.19-rc4) Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) Merging gpio/for-next (4044101fa72b Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) Merging pwm/for-next (6a6bdf52a3c4 pwm: sunxi: document OF bindings) Merging dma-buf/for-next (4eb2440ed60f reservation: Remove shadowing local variable 'ret') Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make) Merging clk/clk-next (57386798f7db Merge branch 'clk-has-parent' into clk-next) Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) Merging kselftest/next (97bf6af1f928 Linux 3.19-rc1) Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c) CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c Merging luto-misc/next (188c901941ef Merge branch 'leds-fixes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging access_once/linux-next (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE) Merging livepatching/for-next (dbed7ddab967 livepatch: fix uninitialized return value) [master fe49b0b579f4] Revert "ath9k_htc: Add a module parameter to disable blink" Merging akpm-current/current (f6d66775c8be ipc,sem: use current->state helpers) CONFLICT (content): Merge conflict in mm/swap.c $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: rtc: isl12022: deprecate use of isl in compatible string for isil Applying: rtc: isl12057: deprecate use of isl in compatible string for isil Applying: staging: iio: isl29028: deprecate use of isl in compatible string for isil Applying: arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix Applying: mm: fix XIP fault vs truncate race Applying: mm-fix-xip-fault-vs-truncate-race-fix Applying: mm-fix-xip-fault-vs-truncate-race-fix-fix Applying: mm: allow page fault handlers to perform the COW Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix-3 Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix Applying: vfs,ext2: introduce IS_DAX(inode) Applying: dax,ext2: replace XIP read and write with DAX I/O Applying: dax,ext2: replace ext2_clear_xip_target with dax_clear_blocks Applying: dax,ext2: replace the XIP page fault handler with the DAX page fault handler Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-2 Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-3 Applying: dax,ext2: replace xip_truncate_page with dax_truncate_page Applying: dax: replace XIP documentation with DAX documentation Applying: vfs: remove get_xip_mem Applying: ext2: remove ext2_xip_verify_sb() Applying: ext2: remove ext2_use_xip Applying: ext2: remove xip.c and xip.h Applying: vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX Applying: ext2: remove ext2_aops_xip Applying: ext2: get rid of most mentions of XIP in ext2 Applying: dax: add dax_zero_page_range Applying: dax-add-dax_zero_page_range-fix Applying: ext4: add DAX functionality Applying: ext4-add-dax-functionality-fix Applying: brd: rename XIP to DAX Applying: MAINTAINERS: fix spelling mistake & remove trailing WS Applying: ocfs2: prepare some interfaces used in append direct io Applying: ocfs2: add functions to add and remove inode in orphan dir Applying: ocfs2: add orphan recovery types in ocfs2_recover_orphans Applying: ocfs2: implement ocfs2_direct_IO_write Applying: ocfs2-implement-ocfs2_direct_io_write-fix Applying: ocfs2: allocate blocks in ocfs2_direct_IO_get_blocks Applying: ocfs2: do not fallback to buffer I/O write if appending Applying: ocfs2: complete the rest request through buffer io Applying: ocfs2: wait for orphan recovery first once append O_DIRECT write crash Applying: ocfs2: set append dio as a ro compat feature Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (10036f542365 mm: add strictlimit knob)
Attachment:
pgp7jJZ5qfl4B.pgp
Description: OpenPGP digital signature
