Hi all, Changes since 20150302: The md tree still had its build failure so I applied a fix patch. The clk tree still had its build failure so I again used the version from next-20150225. Non-merge commits (relative to Linus' tree): 2134 2222 files changed, 64110 insertions(+), 50104 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 207 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 (023a6007a08d Merge tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (23be7fdafa50 ARM: 8305/1: DMA: Fix kzalloc flags in __iommu_alloc_buffer()) Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging) Merging metag-fixes/fixes (c2996cb29bfb metag: Fix KSTK_EIP() and KSTK_ESP() macros) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1) Merging powerpc-merge-mpe/fixes (6262fc474431 powerpc/iommu: Remove IOMMU device references via bus notifier) Merging sparc/master (a38ecbbd0be0 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging net/master (eee617a1c35d Merge branch 'mlx4') Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup()) Merging sound-current/for-linus (8cdebf71098c ALSA: dice: fix wrong offsets for Dice interface) Merging pci-current/for-linus (4efe874aace5 PCI: Don't read past the end of sysfs "driver_override" buffer) Merging wireless-drivers/master (aeb2d2a4c0ae rtlwifi: Remove logging statement that is no longer needed) Merging driver-core.current/driver-core-linus (c517d838eb7d Linux 4.0-rc1) Merging tty.current/tty-linus (c517d838eb7d Linux 4.0-rc1) Merging usb.current/usb-linus (b20b1618b8fc cdc-acm: Add support for Denso cradle CU-321) Merging usb-gadget-fixes/fixes (a0456399fb07 usb: gadget: configfs: don't NUL-terminate (sub)compatible ids) Merging usb-serial-fixes/usb-linus (aa91def41a7b USB: ch341: set tty baud speed according to tty struct) Merging staging.current/staging-linus (abe46b8932dd staging: comedi: adv_pci1710: fix AI INSN_READ for non-zero channel) Merging char-misc.current/char-misc-linus (6c15a8516b81 mei: make device disabled on stop unconditionally) Merging input-current/for-linus (2523caab3ce9 Input: cyapa - remove superfluous type check in cyapa_gen5_read_idac_data()) Merging crypto-current/master (001eabfd54c0 crypto: arm/aes update NEON AES module to latest OpenSSL version) 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 (f47689345931 lguest: update help text.) 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 (a6ddea78fa94 drm/i915: Check for driver readyness before handling an underrun interrupt) 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 (3240dd57e533 ARC: Fix thread_saved_pc()) Merging arm/for-next (42203614b435 Merge branch 'devel-stable' into for-next) Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) Merging arm-soc/for-next (4a3a6f866939 ARM: multi_v7_defconfig: Enable shmobile platforms) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging rpi/for-rpi-next (72a6dbe0ea91 ARM: bcm2835: Use pinctrl header) Merging berlin/berlin/for-next (c517d838eb7d Linux 4.0-rc1) 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 (9de0f7164d0b ARM: mvebu: Fix MPIC unit address) Merging omap/for-next (67fd14b3eca6 ARM: dts: am335x-bone*: usb0 is hardwired for peripheral) Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) Merging renesas/next (e83af0aeab0c Merge branch 'heads/sh73a0-multiplatform-for-v4.1' into next) Merging samsung/for-next (e0e94a5fb27a Merge branch 'v4.0-samsung-defconfig' into for-next) Merging sunxi/sunxi/for-next (50997798fb8a Merge branch 'sunxi/fixes-for-4.0' into sunxi/for-next) Merging tegra/for-next (794345d409ad Merge branch for-3.20/arm64 into for-next) Merging arm64/for-next/core (d476d94f180a arm64: compat: Remove incorrect comment in compat_siginfo) 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 (9987c19ed9a7 CRIS: Whitespace cleanup) 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 (c517d838eb7d Linux 4.0-rc1) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (a01d37d914f9 microblaze: Remove *.dtb files in make clean) Merging mips/mips-for-linux-next (c517d838eb7d Linux 4.0-rc1) Merging nios2/nios2-next (d16d2be111a6 nios2: add kgdb support) Merging parisc-hd/for-next (bfa76d495765 Linux 3.19) Merging powerpc/next (c517d838eb7d Linux 4.0-rc1) Merging powerpc-mpe/next (a6130ed253a9 cxl: Add missing return statement after handling AFU errror) 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 (f6839dbf80eb s390/traps: panic() instead of die() on translation exception) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (740e1433f50e tile: change MAINTAINERS website from tilera.com to ezchip.com) Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) Merging btrfs/next (a742994aa2e2 Btrfs: don't remove extents and xattrs when logging new names) Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) CONFLICT (content): Merge conflict in net/ceph/ceph_common.c CONFLICT (content): Merge conflict in net/ceph/auth_x.c CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h 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 CONFLICT (content): Merge conflict in fs/ceph/inode.c Merging cifs/for-next (5a090583c3fc Update negotiate protocol for SMB3.1 dialect) Merging ecryptfs/next (2a559a8bdeae eCryptfs: ensure copy to crypt_stat->cipher does not overrun) Merging ext3/for_next (6981498d7956 udf: remove bool assignment to 0/1) Merging ext4/dev (6f30b7e37a82 ext4: fix indirect punch hole corruption) Merging f2fs/dev (db3ecdee1cf0 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) CONFLICT (content): Merge conflict in fs/fscache/object.c Merging fuse/for-next (6a57f2a7bb7d fuse: write inode even if no FLUSH) Merging gfs2/for-next (89d4899e65a7 GFS2: Move gfs2_file_splice_write outside of #ifdef) Merging jfs/jfs-next (648695c74811 jfs: Deletion of an unnecessary check before the function call "unload_nls") Merging nfs/linux-next (369d6b7f0097 NFS: Fix stateid used for NFS v4 closes) Merging nfsd/nfsd-next (76cb4be993c0 sunrpc: integer underflow in rsc_parse()) 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 (b388e6a7a6ba UBI: fix missing brace control flow) Merging xfs/for-next (88e8fda99a4c Merge branch 'xfs-mmap-lock' into for-next) Merging file-locks/linux-next (b2b89ebfc0f0 Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux) Merging vfs/for-next (ca160d0085b6 kill struct filename.separate) Merging pci/next (c517d838eb7d Linux 4.0-rc1) Merging hid/for-next (c5780d7b0560 Merge branch 'for-4.1/wacom' into for-next) Merging i2c/i2c/for-next (c517d838eb7d Linux 4.0-rc1) Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) Merging hwmon-staging/hwmon-next (7bb8bd34c133 hwmon: (it87) No need to skip fan4 for IT8603) Merging v4l-dvb/master (48b777c0833b Merge branch 'patchwork' into to_next) Merging kbuild/for-next (94100b52d1c0 Merge branch 'kbuild/kconfig' into kbuild/for-next) Merging kconfig/for-next (bfa76d495765 Linux 3.19) Merging libata/for-next (29200f12a116 sata-fsl: Apply link speed limits) Merging pm/linux-next (2cabcb5b1dce Merge branch 'suspend-to-idle' into linux-next) Merging idle/next (210109f4a19a Merge branches 'turbostat', 'sfi' and 'cpuidle' into release) Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging thermal/next (5912e264d9ee Merge branch 'tmon-fixes' of .git into next) Merging thermal-soc/next (1a9f3d3782f9 Merge branch 'work-fixes' into work-next) Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) 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 (4b18b4fc017b Merge branch 'for-linus' into next) Merging net-next/master (b898441f4ece Merge branch 'neigh_cleanups') CONFLICT (content): Merge conflict in drivers/net/ethernet/rocker/rocker.c Merging ipsec-next/master (ff660f75be36 Merge branch 'stmmac-pci') Merging wireless-drivers-next/master (9b6cc9a807c7 bcma: enable support for PCIe Gen 2 host devices) Merging bluetooth/master (49b31e576a0a filter: refactor common filter attach code into __sk_attach_prog) Merging infiniband/for-next (147d1da951cf Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next) Merging mtd/master (e423c90a6520 mtd: pxa3xx_nand: fix driver when num_cs is 0) Merging l2-mtd/master (a05973a79efe mtd: s3c2410: drop useless / misspelled debug prints) Merging crypto/master (d9850fc529ef crypto: powerpc/sha1 - kernel config) Merging drm/drm-next (329414c4e7b7 Merge tag 'topic/drm-misc-2015-02-25' of git://anongit.freedesktop.org/drm-intel into drm-next) Merging drm-panel/drm/panel/for-next (23923ebaac52 drm: Remove unused DRM_MODE_OBJECT_BRIDGE) Merging drm-intel/for-linux-next (0aaa3f2bd2a5 drm/i915: Make for_each_sprite() take dev_priv as argument) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h Merging drm-tegra/drm/tegra/for-next (07d05cbf60ed drm/tegra: dc: Move more code into ->init()) Merging drm-misc/topic/drm-misc (756ed95dd717 drm/dp: add DPCD definitions from eDP 1.4) Merging sound/for-next (9603cded0e2c ALSA: cmipci: remove a stray space character) Merging sound-asoc/for-next (128e784a8d4f Merge remote-tracking branches 'asoc/topic/rt5677', 'asoc/topic/tegra', 'asoc/topic/wm-adsp' and 'asoc/topic/wm8804' into asoc-next) Merging modules/modules-next (9cc019b8c94f module: Replace over-engineered nested sleep) Merging virtio/virtio-next (5b40a7daf518 virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.) Merging input/next (588a12f590c2 Input: sun4i-ts - add thermal driver dependency) Merging block/for-next (434c26478166 Merge branch 'for-3.20/core' into for-next) Merging device-mapper/for-next (cc707072be1f dm: rename __dm_get_reserved_ios() helper to __dm_get_module_param()) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (c517d838eb7d Linux 4.0-rc1) Merging kgdb/kgdb-next (dd8f30cc0550 kgdb, docs: Fix <para> pdfdocs build errors) Merging md/for-next (b7f12cb56a52 md/bitmap: fix incorrect DIV_ROUND_UP usage.) Applying: md/bitmap: use sector_div for sector_t divisions Merging mfd/for-mfd-next (912778d67d30 mfd: da9150: Add DT binding documentation for core) Merging backlight/for-backlight-next (1926469377bb backlight: da9052_bl: Terminate da9052_wled_ids array with empty element) Merging battery/master (1d93b8502963 power/smb347-charger.c: set IRQF_ONESHOT flag to ensure IRQ request) Merging omap_dss2/for-next (d6c2152b3efd Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) Merging regulator/for-next (224c7f4452a2 Merge remote-tracking branches 'regulator/topic/load-op' and 'regulator/topic/wm8350' into regulator-next) Merging security/next (04f81f0154e4 cipso: don't use IPCB() to locate the CIPSO IP option) Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) Merging selinux/next (387fb779789d selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()) Merging lblnet/next (b2776bf7149b Linux 3.18) Merging watchdog/master (c517d838eb7d Linux 4.0-rc1) Merging iommu/next (a3f447a4f19c iommu/msm: Mark driver BROKEN) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (6140a8f56238 vfio-pci: Add device request interface) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (b0e1ee8e1405 MSI-HOWTO.txt: remove reference on IRQF_DISABLED) Merging trivial/for-next (edb0ec0725bb kexec, Kconfig: spell "architecture" properly) Merging audit/next (5b28255278dd audit: reduce mmap_sem hold for mm->exe_file) Merging devicetree/devicetree/next (fca8ba4ee24d of/unittest: Remove obsolete code) Merging dt-rh/for-next (48b744da6697 Documentation: DT: Renamed of-serial.txt to 8250.txt) Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) Merging spi/for-next (eeddb56bd7ec Merge remote-tracking branches 'spi/topic/bcm53xx', 'spi/topic/dw', 'spi/topic/s3c64xx', 'spi/topic/sc18is602' and 'spi/topic/spidev' into spi-next) Merging tip/auto-latest (be8061cdff5d Merge branch 'x86/urgent') Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer) CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) Merging edac-amd/for-next (2ec591ac7422 EDAC, amd64_edac: Get rid of per-node driver instances) 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 (c19565fc83e6 Merge branch 'for-next/ftrace/core' into trace/for-next) Merging rcu/rcu/next (f4a482c7c523 Merge branches 'doc.2015.02.26a', 'earlycb.2015.02.26a', 'fixes.2015.02.26a', 'gpexp.2015.02.26a', 'hotplug.2015.02.26d', 'sysidle.2015.02.26b' and 'tiny.2015.02.26a' into HEAD) Merging kvm/linux-next (4ff6f8e61eb7 KVM: emulate: fix CMPXCHG8B on 32-bit hosts) 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 (4779b5e32723 KVM: s390: Create ioctl for Getting/Setting guest storage keys) Merging xen-tip/linux-next (a2e75bc2ee20 xenbus: Add proper handling of XS_ERROR from Xenbus for transactions.) Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) Merging workqueues/for-next (2a9faffa8684 workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE) Merging drivers-x86/for-next (c57c0fa4bc9c toshiba_acpi: Cleanup GPL header) Merging chrome-platform/for-next (f3f837e52b14 platform/chrome: Expose Chrome OS Lightbar to users) Merging regmap/for-next (48bbdbb173fa Merge remote-tracking branch 'regmap/fix/irq' into regmap-linus) Merging hsi/for-next (f034125dfdae HSI: nokia-modem: fix error return code) Merging leds/for-next (0cd1b0c3adaa leds: Let the binding document example for leds-gpio follow the gpio bindings) Merging ipmi/for-next (3a31f945b709 ipmi: Remove incorrect use of seq_has_overflowed) Merging driver-core/driver-core-next (c517d838eb7d Linux 4.0-rc1) Merging tty/tty-next (c517d838eb7d Linux 4.0-rc1) Merging usb/usb-next (c517d838eb7d Linux 4.0-rc1) Merging usb-gadget/next (c517d838eb7d Linux 4.0-rc1) Merging usb-serial/usb-next (394a10331a9e USB: ch341: remove redundant close from open error path) Merging staging/staging-next (91b3a68558ba staging: lustre: Convert uses of "int rc = seq_printf(...)") Merging char-misc/char-misc-next (c517d838eb7d Linux 4.0-rc1) Merging cgroup/for-next (295458e67284 cgroup: call cgroup_subsys->bind on cgroup subsys initialization) Merging scsi/for-next (cad8000836ef Merge branch 'misc' into for-next) Merging target-updates/for-next (d4c5dcacfaff target: rewrite fd_execute_write_same) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging pinctrl/for-next (c517d838eb7d Linux 4.0-rc1) Merging vhost/linux-next (1179c21e8917 virtio_blk: fix comment for virtio 1.0) 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 (2f97c20e5f7c gpio: tps65912: fix wrong container_of arguments) Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) Merging pwm/for-next (b65af27ad89d pwm: tegra: Use NSEC_PER_SEC) Merging dma-buf/for-next (56a4d3e2e2d4 staging: android: ion: fix wrong init of dma_buf_export_info) Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) Merging clk/clk-next (ebd367676852 clk: clk_set_parent() with current parent shouldn't fail) $ git reset --hard HEAD^ Merging next-20150225 version of clk 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 (6ddf898c23d6 selftests/exec: Check if the syscall exists and bail if not) Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) Merging luto-misc/next (4710be56d76e x86_64, entry: Remove a bogus ret_from_fork optimization) Merging access_once/linux-next (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE) Merging livepatching/for-next (0b1446be10a0 Merge branch 'for-4.0/upstream-fixes' into for-next) Merging akpm-current/current (c607a4d95b88 lib/lz4/lz4_decompress.c: pull out constant tables) CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/fid/lproc_fid.c CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h $ git checkout -b akpm remotes/origin/akpm/master Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text Applying: mips: ip32: add platform data hooks to use DS1685 driver Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (5af83e0c8780 mm: add strictlimit knob)
Attachment:
pgpNAeAFEUMny.pgp
Description: OpenPGP digital signature
