Hi all, Please do not add any v4.2 material to your linux-next included trees until after v4.1-rc1 is released. Changes since 20150415: Dropped tree: akpm-current (too many conflicts) The s390 tree gained a conflict against Linus' tree. The xfs tree gaind a conflict against Linus' tree and a build failure for which I added a merge fix patch. The xen-tip tree lost its build failure. The target-updates tree gained a conflict against the infiniband tree. The vhost tree gained conflicts agsinst the virtio tree. The akpm-current tree gained lots of conflicts so I dropped it for today. The akpm tree lost several patches that turned up elsewhere. Non-merge commits (relative to Linus' tree): 3126 3156 files changed, 168458 insertions(+), 81680 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 215 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 (09d51602cf84 Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux) 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 (e4140819dadc ARC: signal handling robustify) Merging arm-current/fixes (6c5c2a01fcfd ARM: proc-arm94*.S: fix setup function) Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge-mpe/fixes (a7e73e711e48 powerpc/kvm: Fix ppc64_defconfig + PPC_POWERNV=n build error) Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1) Merging sparc/master (64fb1d0e975e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging net/master (04b7fe6a4a23 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging ipsec/master (092a29a40bab vti6: fix uninit when using x-netns) Merging sound-current/for-linus (bc26d4d06e33 sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)) Merging pci-current/for-linus (71f83b8e5c7f Revert "sparc/PCI: Clip bridge windows to fit in upstream windows") Merging wireless-drivers/master (69628cd0652a Merge tag 'iwlwifi-for-kalle-2015-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (bc465aa9d045 Linux 4.0-rc5) Merging tty.current/tty-linus (f22e6e847115 Linux 4.0-rc7) Merging usb.current/usb-linus (f22e6e847115 Linux 4.0-rc7) Merging usb-gadget-fixes/fixes (65582a7f4ce5 usb: isp1760: fix spin unlock in the error path of isp1760_udc_start) Merging usb-serial-fixes/usb-linus (39a8804455fb Linux 4.0) Merging staging.current/staging-linus (f22e6e847115 Linux 4.0-rc7) Merging char-misc.current/char-misc-linus (bc465aa9d045 Linux 4.0-rc5) Merging input-current/for-linus (85a3685852d9 Merge branch 'next' into for-linus) Merging crypto-current/master (3abafaf2192b crypto: arm - workaround for building with old binutils) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (41d9489319f2 drivers/of: Add empty ranges quirk for PA-Semi) Merging rr-fixes/fixes (f47689345931 lguest: update help text.) Merging vfio-fixes/for-linus (ec76f4007079 vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX) Merging kselftest-fixes/fixes (67d8712dcc70 selftests: Fix build failures when invoked from kselftest target) Merging drm-intel-fixes/for-linux-next-fixes (39a8804455fb Linux 4.0) 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 (fa0b617bd3c8 ARC: perf: Rename DT binding to not confuse with power mgmt) Merging arm/for-next (4b2f8838479e Merge branch 'devel-stable' into for-next) Merging arm-perf/for-next/perf (39a8804455fb Linux 4.0) Merging arm-soc/for-next (0f0175702e2e arm-soc: document merges) Merging at91/at91-next (d8a291a11778 Merge tag 'at91-dt2' into at91-next) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging rpi/for-rpi-next (9a5a3543e168 ARM: bcm2835: Fix i2c0 node name) 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 (33e156f34c26 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) Merging mvebu/for-next (dd9feff9079c Merge branch 'mvebu/fixes' into mvebu/for-next) Merging omap/for-next (23aa6c6f4bed Merge branch 'omap-for-v4.0/fixes' into for-next) Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c Merging renesas/next (53a6e5250291 Merge branch 'heads/soc-cleanup-for-v4.1' into next) Merging samsung/for-next (5d5443b9c3ba Merge branch 'v4.1-next/mach-samsung' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-exynos/platsmp.c Merging sunxi/sunxi/for-next (5a04c6a64b01 Merge branches 'sunxi/clocks-for-4.1', 'sunxi/dt-for-4.1', 'sunxi/core-for-4.1' and 'sunxi/drivers-for-4.1', tag 'sunxi-defconfig-for-4.1' into sunxi/for-next) Merging tegra/for-next (47ee17a644f4 Merge branch for-4.1/dt into for-next) Merging arm64/for-next/core (6d1966dfd6e0 arm64: fix midr range for Cortex-A57 erratum 832075) Merging arm64-acpi/for-next/acpi (7676fa70feb2 ARM64 / ACPI: make acpi_map_gic_cpu_interface() as void function) CONFLICT (content): Merge conflict in drivers/xen/Kconfig CONFLICT (content): Merge conflict in arch/arm64/Kconfig Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback) Merging cris/for-next (d939b52abe0c cris: fix integer overflow in ELF_ET_DYN_BASE) Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) Merging ia64/next (62f269ef8191 pstore: Fix the ramoops module parameters update) Merging m68k/for-next (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization) Merging m68knommu/for-next (6e4206136faa m68knommu: fix fec setup warning for ColdFire 5271 builds) Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg') Merging microblaze/next (c2219eda5478 microblaze: Fix syscall error recovery for invalid syscall IDs) Merging mips/mips-for-linux-next (3e20a26b02bd Merge branch '4.0-fixes' into mips-for-linux-next) Merging nios2/nios2-next (4a89c3088ff6 nios2: fix cache coherency issue when debug with gdb) Merging parisc-hd/for-next (476840458128 parisc: Eliminate sg_virt_addr() and private scatterlist.h) CONFLICT (content): Merge conflict in arch/parisc/include/asm/Kbuild Merging powerpc-mpe/next (2fe0753d4940 powerpc/powermac: Fix build error seen with powermac smp builds) Merging powerpc/next (65e7bb2a34fe Merge branch 'next-sriov' into next) Merging fsl/next (d41444daba1f powerpc/corenet: enable CONFIG_I2C_MUX and CONFIG_I2C_MUX_PCA954x) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (80ed156a3d12 s390/pci: add locking for fmb access) CONFLICT (content): Merge conflict in arch/s390/pci/pci_debug.c Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (128f3cb9398b tile: nohz: warn if nohz_full uses hypervisor shared cores) Merging uml/linux-next (fe205bdd1321 um: Print minimum physical memory requirement) Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (2ba9268dd603 Merge tag 'xtensa-for-next-20150413' of git://github.com/jcmvbkbc/linux-xtensa into for_next) Merging btrfs/next (e082f56313f3 btrfs: quota: Update quota tree after qgroup relationship change.) 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 (be4a8e38d68f Update negotiate protocol for SMB3.1 dialect) Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) Merging ext3/for_next (3adc12e96482 udf: Update ctime and mtime when directory is modified) Merging ext4/dev (6ddb2447846a ext4 crypto: enable encryption feature flag) Merging f2fs/dev (10027551ccf5 f2fs: pass checkpoint reason on roll-forward recovery) Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) Merging fuse/for-next (94e4fe2cab3d fuse: explicitly set /dev/fuse file's private_data) Merging gfs2/for-next (a31a0529efad GFS2: Use average srttb value in congestion calculations) Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers) Merging nfs/linux-next (9eccca084320 Linux 4.0-rc3) Merging nfsd/nfsd-next (1ec8c0c47f63 nfsd: Remove duplicate macro define for max sec label length) Merging overlayfs/overlayfs-next (71cbad7e694e ovl: upper fs should not be R/O) Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) Merging v9fs/for-next (f569d3ef8254 net/9p: add a privport option for RDMA transport.) Merging ubifs/linux-next (502690674281 UBI: power cut emulation for testing) Merging xfs/for-next (542c311813d5 Merge branch 'xfs-dio-extend-fix' into for-next) CONFLICT (content): Merge conflict in fs/xfs/xfs_file.c Applying: xfs: fix up for direct_IO API change Merging file-locks/linux-next (7505256626b0 Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux) Merging net-next/master (04b7fe6a4a23 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging vfs/for-next (6d3b3d3367cb direct-io: only inc/dec inode->i_dio_count for file systems) CONFLICT (content): Merge conflict in kernel/trace/trace.c CONFLICT (content): Merge conflict in fs/xfs/xfs_iops.c CONFLICT (content): Merge conflict in fs/hfsplus/xattr.h CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h CONFLICT (content): Merge conflict in fs/ext4/symlink.c CONFLICT (content): Merge conflict in fs/ext4/namei.c CONFLICT (content): Merge conflict in fs/btrfs/xattr.c CONFLICT (content): Merge conflict in fs/befs/linuxvfs.c CONFLICT (content): Merge conflict in fs/affs/amigaffs.c Applying: fs/hfsplus: merge fix for d_inode() annotation Merging pci/next (5468d5a64bf1 Merge branch 'pci/misc' into next) Merging hid/for-next (e7f236eb0af9 Merge branch 'for-4.1/sensor-hub' into for-next) Merging i2c/i2c/for-next (64fb1d0e975e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) Merging hwmon-staging/hwmon-next (f354169e0f7d hwmon: (pwm-fan) Update the duty cycle inorder to control the pwm-fan) Merging v4l-dvb/master (bfb4e26f2532 Merge branch 'patchwork' into to_next) CONFLICT (content): Merge conflict in include/linux/kconfig.h CONFLICT (content): Merge conflict in drivers/staging/media/mn88473/mn88473.c CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt Merging kbuild/for-next (1be735fc0329 Merge branch 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (bfa76d495765 Linux 3.19) Merging libata/for-next (5df07b74f671 Remove celleb-only SCC PATA drivers) Merging pm/linux-next (ec8382996d13 Merge branches 'acpi-scan' and 'acpi-dock') Merging idle/next (9d72137b1930 Merge branch 'cpu-online-next' into next) Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging thermal/next (75229df63655 Merge branches 'thermal-fix', 'thermal-intel' and 'thermal-soc' of .git into next) Merging thermal-soc/next (62d0817a0aca Merge branch 'work-linus' 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 (fb3844d034b8 Merge branch 'for-linus' into next) CONFLICT (modify/delete): drivers/dma/intel_mid_dma_regs.h deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of drivers/dma/intel_mid_dma_regs.h left in tree. CONFLICT (modify/delete): drivers/dma/intel_mid_dma.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of drivers/dma/intel_mid_dma.c left in tree. CONFLICT (modify/delete): arch/arm/mach-shmobile/board-mackerel.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of arch/arm/mach-shmobile/board-mackerel.c left in tree. CONFLICT (modify/delete): arch/arm/mach-shmobile/board-ape6evm.c deleted in HEAD and modified in slave-dma/next. Version slave-dma/next of arch/arm/mach-shmobile/board-ape6evm.c left in tree. $ git rm -f arch/arm/mach-shmobile/board-mackerel.c arch/arm/mach-shmobile/board-ape6evm.c $ git rm -f drivers/dma/intel_mid_dma_regs.h drivers/dma/intel_mid_dma.c Applying: v4l: xilinx: fix for include file movement Merging ipsec-next/master (74005991b78a xfrm: Do not parse 32bits compiled xfrm netlink msg on 64bits host) Merging wireless-drivers-next/master (f56d9e23b78e ssb: add delay after PCI reset to fix SoC reboots) Merging bluetooth/master (eb3c20f99289 Bluetooth: btusb: Fix two coding style issues) Merging infiniband/for-next (c1c2fef6cfb0 Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1) Merging mtd/master (5e0899db69e2 mtd: nand: MTD_NAND_HISI504 should depend on HAS_DMA) Merging l2-mtd/master (81a1209c9091 mtd: spi-nor: Add support for Macronix mx25u6435f serial flash) Merging crypto/master (3abafaf2192b crypto: arm - workaround for building with old binutils) Merging drm/drm-next (aa219a0dd777 Merge tag 'drm-intel-next-fixes-2015-04-15' of git://anongit.freedesktop.org/drm-intel into drm-next) CONFLICT (content): Merge conflict in include/uapi/linux/media-bus-format.h CONFLICT (content): Merge conflict in Documentation/DocBook/media/v4l/subdev-formats.xml Applying: drm/msm: fixes for regulator_set_optimum_mode name change Merging drm-panel/drm/panel/for-next (1c550fa193d0 drm/panel: Add support for Ampire AM-800480R3TMQW-A1H 800x480 7" panel) Merging drm-intel/for-linux-next (37ef01ab5d24 drm/i915: Dont enable CS_PARSER_ERROR interrupts at all) Merging drm-tegra/drm/tegra/for-next (535a65db484f drm/tegra: sor: Reset during initialization) Merging drm-misc/topic/drm-misc (747552b947e1 drm: Fix the 'native defer' message in drm_dp_i2c_do_msg()) Merging drm-exynos/exynos-drm/for-next (3cf711584d3e drm/exynos: Fix FIMD buffer size calculation) Merging drm-msm/msm-next (d5af49c92a8a drm/msm/mdp5: Enable DSI connector in msm drm driver) Merging sound/for-next (bc26d4d06e33 sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)) Merging sound-asoc/for-next (0944430a0a4a Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic/cs35l32' and 'asoc/topic/sgtl5000' into asoc-next) Merging modules/modules-next (464f3624019e modpost: do not try to match the SHT_NUL section.) Merging virtio/virtio-next (9abbfb486f5c virtio: drop virtio_device_is_legacy_only) Merging input/next (2310568f570e Input: alps - document separate pointstick button bits for V2 devices) Merging block/for-next (889fa31f00b2 blk-mq: reduce unnecessary software queue looping) Merging device-mapper/for-next (44c144f9c8e8 dm crypt: fix missing error code return from crypt_ctr error path) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (96541bac0b4e Revert "mmc: core: Convert mmc_driver to device_driver") Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) Merging md/for-next (14d18f75214b md/raid5: allow the stripe_cache to grow and shrink.) Merging mfd/for-mfd-next (e554a99ee8d0 mfd: sec: Fix RTC alarm interrupt number on S2MPS11) Merging backlight/for-backlight-next (b1f85c0fec20 backlight: da9052_bl: Terminate da9052_wled_ids array with empty element) Merging battery/master (5939d9dfe440 power: twl4030_madc_battery: Add missing MODULE_ALIAS) Merging omap_dss2/for-next (72fc8b7187cd Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next) Merging regulator/for-next (3c24567c65bf Merge remote-tracking branches 'regulator/topic/max14577' and 'regulator/topic/max77843' into regulator-next) Merging security/next (5deeb5cece3f lsm: copy comm before calling audit_log to avoid race in string printing) Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) Merging selinux/next (cf7b6c0205f1 selinux: increase avtab max buckets) Merging lblnet/next (b2776bf7149b Linux 3.18) Merging watchdog/master (fe92a2e35727 watchdog: octeon: use fixed length string for register names) Merging iommu/next (7f65ef01e131 Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next) Merging dwmw2-iommu/master (03ecc32c5274 iommu/vt-d: support extended root and context entries) Merging vfio/next (5a0ff17741c1 vfio-pci: Fix use after free) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (197175427a22 Documentation/memcg: update memcg/kmem status) Merging trivial/for-next (0e4f93e5017d goldfish: goldfish_tty_probe() is not using 'i' any more) Merging audit/next (724e7bfcc566 audit: Remove condition which always evaluates to false) Merging devicetree/devicetree/next (a2166ca5f320 Merge remote-tracking branch 'robh/for-next' into devicetree/next) Merging dt-rh/for-next (648082735792 of: base: improve of_get_next_child() kernel-doc) Merging mailbox/mailbox-for-next (ee23d66af921 mailbox: arm_mhu: add driver for ARM MHU controller) Merging spi/for-next (9331bf51ea99 Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm2835-code' and 'spi/fix/bitbang' into spi-linus) Merging tip/auto-latest (089ea075f6fc Merge branch 'x86/pmem') 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 (1afaa0551521 EDAC: Constify of_device_id array) Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) Merging ftrace/for-next (2ea825a9f1ad Merge branch 'for-next/ftrace/core' into trace/for-next) Merging rcu/rcu/next (8d7dc9283f39 rcu: Control grace-period delays directly from value) Merging kvm/linux-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) Merging kvm-arm/next (d44758c0dfc5 KVM: arm/arm64: enable KVM_CAP_IOEVENTFD) Merging kvm-ppc/kvm-ppc-next (35fd68a38d57 kvm: x86: fix x86 eflags fixed bit) Merging kvms390/next (816c7667ea97 KVM: s390: migrate vcpu interrupt state) Merging xen-tip/linux-next (0b97b03d88b4 xen/pci: Try harder to get PXM information for Xen) Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) Merging workqueues/for-next (6ba94429c8e7 workqueue: Reorder sysfs code) Merging drivers-x86/for-next (cdbff6119408 MAINTAINERS: Add me on list of Dell laptop drivers) Merging chrome-platform/for-next (8ce580932f8e platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST) Merging regmap/for-next (04b7fe6a4a23 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging hsi/for-next (265ef3ee9575 HSI: cmt_speech: fix error return code) Merging leds/for-next (ccdc45075aea leds: Don't treat the LED name as a format string) Merging ipmi/for-next (d0acf734d886 ipmi_ssif: Use interruptible completion for waiting in the thread) Merging driver-core/driver-core-next (c9e15f25f514 debugfs: allow bad parent pointers to be passed in) Merging tty/tty-next (5dbc32a88f1e n_gsm: Drop unneeded cast on netdev_priv) CONFLICT (content): Merge conflict in drivers/dma/Kconfig Merging usb/usb-next (00fe52deb45b drivers/usb/core: devio.c: Removed an uneeded space before tab) Merging usb-gadget/next (bbc78c07a51f usb: core: hub: use new USB_RESUME_TIMEOUT) Merging usb-serial/usb-next (65dd82ae453f USB: f81232: fix some minor style issues) Merging staging/staging-next (c610f7f772aa Merge 4.0-rc7 into staging-next) Merging char-misc/char-misc-next (ea5505fabd3b mei: trace: remove unused TRACE_SYSTEM_STRING) Merging extcon/extcon-next (66bee35f2968 extcon: Fix missing locking when [un]registering notifiers) Merging kdbus/kdbus (9fb9cd0f4434 kdbus: avoid the use of struct timespec) CONFLICT (content): Merge conflict in Documentation/Makefile Merging cgroup/for-next (34ebe933417e cpuset, isolcpus: document relationship between cpusets & isolcpus) Merging scsi/for-next (694600bc1e55 Merge branch 'misc' into for-next) Merging target-updates/for-next (65204c84d766 target: fix tcm_mod_builder.py) CONFLICT (content): Merge conflict in drivers/xen/xen-scsiback.c CONFLICT (content): Merge conflict in drivers/infiniband/ulp/srpt/ib_srpt.c Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging pinctrl/for-next (1dfe0d159dc7 pinctrl: sirf: move sgpio lock into state container) Merging vhost/linux-next (dd29714ec856 tun, macvtap: higher order allocations for skbs) CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3-pci.c CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt Merging remoteproc/for-next (315491e5d6ee remoteproc: add IOMMU hardware capability flag) Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) Merging gpio/for-next (03daa6f82f2b Revert "gpio: sch: use uapi/linux/pci_ids.h directly") Merging dma-mapping/dma-mapping-next (04abab698285 include/dma-mapping: Clarify output of dma_map_sg) Merging pwm/for-next (71d54bfabb28 drivers/pwm: Remove __init initializer for pwm_add_table) Merging dma-buf/for-next (56a4d3e2e2d4 staging: android: ion: fix wrong init of dma_buf_export_info) Merging userns/for-next (e0c9c0afd2fc mnt: Update detach_mounts to leave mounts connected) Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) Merging clk/clk-next (03bc10ab5b0f clk: check ->determine/round_rate() return value in clk_calc_new_rates) 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 (2bfd4d1f8c2b ftracetest: Do not use usleep directly) Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5) Merging livepatching/for-next (075b759be1bb Merge branch 'for-4.1/core-s390' into for-next) Merging exec-domain/exec_domain_rip_v2 (97b2f0dc3314 arm64: Removed unused variable) Merging akpm-current/current (5d77fd3b294b x86: switch to using asm-generic for seccomp.h) CONFLICT (content): Merge conflict in mm/util.c CONFLICT (content): Merge conflict in mm/swap.c CONFLICT (content): Merge conflict in mm/page_alloc.c CONFLICT (content): Merge conflict in mm/mempool.c CONFLICT (add/add): Merge conflict in mm/cma_debug.c CONFLICT (content): Merge conflict in lib/vsprintf.c CONFLICT (content): Merge conflict in kernel/watchdog.c CONFLICT (content): Merge conflict in kernel/fork.c CONFLICT (content): Merge conflict in include/linux/swap.h CONFLICT (content): Merge conflict in include/linux/page-flags.h CONFLICT (content): Merge conflict in include/linux/kconfig.h CONFLICT (content): Merge conflict in fs/proc/array.c CONFLICT (content): Merge conflict in fs/ocfs2/super.c CONFLICT (content): Merge conflict in fs/ocfs2/localalloc.c CONFLICT (content): Merge conflict in fs/hfsplus/xattr.c CONFLICT (content): Merge conflict in fs/fat/inode.c CONFLICT (content): Merge conflict in fs/binfmt_elf.c CONFLICT (content): Merge conflict in fs/befs/linuxvfs.c CONFLICT (content): Merge conflict in fs/affs/amigaffs.c CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c CONFLICT (content): Merge conflict in drivers/rtc/rtc-mc13xxx.c CONFLICT (content): Merge conflict in drivers/rtc/class.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c CONFLICT (content): Merge conflict in arch/s390/pci/pci_debug.c CONFLICT (content): Merge conflict in arch/s390/mm/mmap.c CONFLICT (content): Merge conflict in arch/parisc/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/arm64/Kconfig CONFLICT (content): Merge conflict in Documentation/printk-formats.txt CONFLICT (content): Merge conflict in Documentation/blockdev/zram.txt $ git reset --hard $ git checkout -b akpm remotes/origin/akpm/master Applying: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR Applying: mm, x86: document return values of mapping funcs Applying: mtrr, x86: fix MTRR lookup to handle inclusive entry Applying: mtrr, x86: remove a wrong address check in __mtrr_type_lookup() Applying: mtrr, x86: fix MTRR state checks in mtrr_type_lookup() Applying: mtrr, x86: define MTRR_TYPE_INVALID for mtrr_type_lookup() Applying: mtrr, x86: clean up mtrr_type_lookup() Applying: mtrr, mm, x86: enhance MTRR checks for KVA huge page mapping Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (263e33c73665 mm: add strictlimit knob)
Attachment:
pgpQx3SigC6pl.pgp
Description: OpenPGP digital signature
