Hi all, Changes since 20150130: The net-next tree gained conflicts against the net tree. The spi tree lost its build failure. The kvm tree gained conflicts against Linus' tree. The target-updates tree gained a conflict against Linus' tree. The akpm-current tree gained a conflict against the fsl tree. Non-merge commits (relative to Linus' tree): 6831 6851 files changed, 276792 insertions(+), 157095 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 (00845eb968ea sched: don't cause task state changes in nested sleep debugging) 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 (fba289054f24 ARM: 8298/1: ARM_KERNMEM_PERMS only works with MMU enabled) 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 (c59c961ca511 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (0d32ef8cef9a net: sched: fix panic in rate estimators) Merging ipsec/master (59343cd7c480 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging sound-current/for-linus (4161b4505f16 ALSA: ak411x: Fix stall in work callback) Merging pci-current/for-linus (19c5392eb1c1 PCI: designware: Reject MSI-X IRQs) 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 (54eb4cd46542 Merge tag 'fixes-for-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) 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 (47c1ffb2b6b6 Input: elantech - add more Fujtisu notebooks to force crc_enabled) 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 (389e831128b5 Merge branch 'devel-stable' into for-next) Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) Merging arm-soc/for-next (f9db7e23d11f Merge branch 'fixes' into for-next) CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug 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 (feeddcd9c17b Merge branch 'mvebu/dt' into mvebu/for-next) Merging omap/for-next (5cb1e109eee0 Merge tag 'omap-for-v3.20/dt-pt3-v2' into for-next) Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) Merging renesas/next (b2cb094d275e Merge branch 'heads/soc-fixes-for-v3.19' into next) Merging samsung/for-next (ce275c369a0b Merge branch 'v3.20-samsung-cpuidle' 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 (41089357e187 arm64: Fix section mismatch on alloc_init_p[mu]d()) 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 (a74f9ec869a8 CRIS: macro whitespace fixes in uaccess.h) 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 (4436820a98cd m68k/defconfig: Enable Ethernet bridging) 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 (a788a832b557 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 (31494cf3532c powerpc/powernv: Don't alloc IRQ map if necessary) Merging fsl/next (0dc294f717d4 powerpc/mm: bail out early when flushing TLB page) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (5c75a0dac309 s390/smp: increase maximum value of NR_CPUS to 512) 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 (7a1ceba07170 cifs: fix MUST SecurityFlags filtering) 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 (b10a08194c2b quota: Store maximum space limit in bytes) Merging ext4/dev (d7e9b1b7b9ab ext4: change to use setup_timer() instead of init_timer()) Merging f2fs/dev (b83bd37d3b01 f2fs: introduce a batched trim) 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 (c7c545d4a348 NFS: a couple off by ones) 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 (832b52a15085 UBI: Block: Explain usage of blk_rq_map_sg()) 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 (795b4313ea3b Merge branch 'iov_iter' into for-next) Merging pci/next (12ae9ecc4619 Merge branch 'pci/config' into next) CONFLICT (content): Merge conflict in arch/mips/pci/pcie-octeon.c CONFLICT (content): Merge conflict in arch/mips/pci/pci-octeon.c CONFLICT (content): Merge conflict in arch/mips/pci/pci-bcm1480.c Merging hid/for-next (dc5439f4c356 Merge branch 'for-3.20/wacom' into for-next) Merging i2c/i2c/for-next (6d9130940f26 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 (7640c108d591 Merge branch 'patchwork' into to_next) Merging kbuild/for-next (8d18d1d514d1 Merge branch 'kbuild/kconfig' into kbuild/for-next) Merging kconfig/for-next (b2776bf7149b Linux 3.18) Merging libata/for-next (c443dffd97c1 Merge branch 'for-3.20' into for-next) Merging pm/linux-next (b4302834d287 Merge branch 'pm-cpufreq' into linux-next) Merging idle/next (2985a86aa4ec Merge branch 'turbostat' into next) 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 (ec6f34e5b552 Linux 3.19-rc5) Merging thermal-soc/next (1024cf8b0fcd thermal: exynos: Remove exynos_tmu_data.c file) Merging ieee1394/for-next (1f95f8c9fddb firewire: sbp2: remove redundant check for bidi command) 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 (2caabb3d2e60 Merge branch 'hso-next') CONFLICT (content): Merge conflict in include/linux/if_vlan.h CONFLICT (content): Merge conflict in drivers/net/vxlan.c 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 Merging ipsec-next/master (ff660f75be36 Merge branch 'stmmac-pci') Merging wireless-drivers-next/master (3f7bb3f34cc8 b43: AC-PHY: prepare place for developing new PHY support) Merging bluetooth/master (bf21d7931a5d Bluetooth: Fix OOB data present for BR/EDR Secure Connections Only mode) 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 (9ec60ca68268 drm: atmel-hlcdc: Add dependency on ARM) Merging drm-panel/drm/panel/for-next (23923ebaac52 drm: Remove unused DRM_MODE_OBJECT_BRIDGE) Merging drm-intel/for-linux-next (1293eaa3ebf9 drm/i915: Update DRIVER_DATE to 20150130) Merging drm-tegra/drm/tegra/for-next (31f40f86526b drm/tegra: Use correct relocation target offsets) Merging drm-misc/topic/core-stuff (eb2ed66fe56f drm/irq: Don't disable vblank interrupts when already disabled) Merging sound/for-next (58647286abcd ALSA: line6: Remove unused line6_midibuf_skip_message()) Merging sound-asoc/for-next (000c89dbe22a Merge remote-tracking branches 'asoc/topic/wm8804', 'asoc/topic/wm8904', '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 (448c7f3830ca Input: MT - add support for balanced slot assignment) Merging block/for-next (57fdd59b1e9a Merge branch 'for-3.20/drivers' into for-next) CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.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 (f7b2d0c5f5f1 Merge tag 'dm-3.19-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm into dm-for-3.20) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (c13045b1e939 mmc: pwrseq_simple: Add optional reference clock support) 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 (24727b45b484 power_supply: 88pm860x: Fix leaked power supply on probe fail) Merging omap_dss2/for-next (7efc436cd45c Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) Merging regulator/for-next (7c35b5c7149e Merge remote-tracking branches 'regulator/topic/rpm', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next) Merging security/next (bfc8419670bb Merge tag 'keys-next-20150123' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) Merging selinux/next (7c596bd904b3 SELinux: fix error code in policydb_init()) Merging lblnet/next (b2776bf7149b Linux 3.18) Merging watchdog/master (00845eb968ea sched: don't cause task state changes in nested sleep debugging) Merging iommu/next (dfc4940c0347 Merge branches 'iommu/fixes', 'arm/renesas', 'arm/exynos', 'arm/omap', 'ppc/pamu' 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 (202799be447b doc: brief user documentation for completion) 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 (4b759c7c6e33 Merge remote-tracking branch 'spi/topic/xilinx' into spi-next) Merging tip/auto-latest (2619a5bcf0c8 manual merge of x86/ras) Merging clockevents/clockevents/next (4c8305221193 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 (30263b4052c6 EDAC, mv64x60_edac: Fix an error code in probe()) 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 (c418b8035fac cpu: Stop newly offlined CPU from using RCU readers) 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/sys_regs.c CONFLICT (content): Merge conflict in arch/arm64/kvm/Kconfig CONFLICT (content): Merge conflict in arch/arm/kvm/mmu.c 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 (dab069c61aa3 xen/gntdev: provide find_special_page VMA operation) 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 (ed52ccbce7ff asus-laptop: use DEVICE_ATTR_xx macros) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) Merging regmap/for-next (18b2ce75d844 Merge remote-tracking branch 'regmap/topic/doc' into regmap-next) Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer) Merging leds/for-next (4552d2ee3ccb DT: leds: Add led-sources property) 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 (dd3217408168 Merge tag 'usb-serial-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next) Merging usb-gadget/next (74379991f6eb usb: phy: phy-generic: Fix USB PHY gpio reset) CONFLICT (content): Merge conflict in drivers/usb/musb/musb_virthub.c Merging usb-serial/usb-next (3e264ffc831e USB: mos7840: remove unused code) Merging staging/staging-next (71e365ed0ca8 staging: Remove logger and alarm-dev from android Makefile) Merging char-misc/char-misc-next (786f949631c7 Merge tag 'extcon-next-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) 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 (ddc90c39e08a Merge branch 'misc' into for-next) Merging target-updates/for-next (8c04be24d3f1 vhost/scsi: Set VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 feature bits) CONFLICT (content): Merge conflict in drivers/vhost/scsi.c Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging pinctrl/for-next (8f61904b0b20 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 (8c8ec414bdf5 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 (9c959bfe0039 pwm: Add device tree binding document for IMG PWM DAC) 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 (59cf3fcf9baf clk: Make clk API return per-user struct clk instances) Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) Merging aio/master (f84249f4cfef fs/aio: fix sleeping while TASK_INTERRUPTIBLE) Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) Merging kselftest/next (ef6c93c78457 kbuild: add a new kselftest_install make target to install selftests) 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) Merging akpm-current/current (78ccbbfb50bf mm: remove remaining references to NUMA hinting bits and helpers -fix) CONFLICT (content): Merge conflict in mm/swap.c CONFLICT (content): Merge conflict in include/linux/mm.h CONFLICT (content): Merge conflict in arch/powerpc/include/asm/pgtable-ppc32.h $ 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-functions-to-add-and-remove-inode-in-orphan-dir-fix 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 (9721c95386b1 mm: add strictlimit knob)
Attachment:
pgpBkRChY0wMu.pgp
Description: OpenPGP digital signature
