Hi all, Changes since 20150615:
The rdma tree gained a conflict against the nfs tree. The rdma tree gained a conflict against the net-next tree. The tip tree gained a conflict against the iommu tree. The tip tree gained a conflict against the crypto tree. The akpm-current tree gained a conflict against the vfs tree. Non-merge commits (relative to Linus' tree): 11023 9537 files changed, 1021004 insertions(+), 233731 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 219 trees (counting Linus' and 31 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 $ git checkout master $ git reset --hard stable Merging origin/master (0f57d86787d8 Linux 4.1-rc8) 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 (0bbe6b5a73c0 ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone) 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 (c65b99f04684 Linux 4.1-rc6) Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1) Merging sparc/master (c46a024ea5eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (ac0a72a3e6e8 net/mlx4_core: Disable Granular QoS per VF under IB/Eth VPI configuration) Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) Merging sound-current/for-linus (145c0e914d2c ALSA: hda - Fix unused label skip_i915) Merging pci-current/for-linus (552bc94ebeeb PCI: Preserve resource size during alignment reordering) Merging wireless-drivers/master (38fe44e61a89 Merge tag 'iwlwifi-for-kalle-2015-05-28' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging tty.current/tty-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging usb.current/usb-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations) Merging usb-serial-fixes/usb-linus (df72d588c54d USB: cp210x: add ID for HubZ dual ZigBee and Z-Wave dongle) Merging staging.current/staging-linus (d4a4f75cd8f2 Linux 4.1-rc7) Merging char-misc.current/char-misc-linus (e26081808eda Linux 4.1-rc4) Merging input-current/for-linus (7f2ca8b55aef Input: synaptics - add min/max quirk for Lenovo S540) Merging crypto-current/master (412c98c1bef6 crypto: caam - fix RNG buffer cache alignment) Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) Merging rr-fixes/fixes (f36963c9d3f6 cpumask_set_cpu_local_first => cpumask_local_spread, lament) Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) Merging kselftest-fixes/fixes (ba155e2d21f6 Linux 4.1-rc5) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging drm-intel-fixes/for-linux-next-fixes (245ec9d85696 Revert "drm/i915: Don't skip request retirement if the active list is empty") 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 (9907203dd026 ARC: intc: split into ARCompact ISA specific, common bits) Merging arm/for-next (9ce93bdda7b7 ARM: fix new BSYM() usage introduced via for-arm-soc branch) Merging arm-perf/for-next/perf (74cf0bc75f16 arm: perf: unify perf_event{,_cpu}.c) Merging arm-soc/for-next (1f697b6bbd68 Merge branch 'next/dt' into for-next) Merging at91/at91-next (dd1f58f398fb Merge branch 'at91-4.2-dt' into at91-next) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging rpi/for-rpi-next (50b674b89355 Merge branches 'for-rpi-next-soc' and 'for-rpi-next-dt' into for-rpi-next) Merging berlin/berlin/for-next (7f8ad9c26be9 Merge branch 'berlin/simple-mfd' into berlin/for-next) Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) Merging imx-mxs/for-next (5bfaa924477b Merge branch 'imx/defconfig' into for-next) Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size) Merging mvebu/for-next (96a9fef8a7fa Merge branch 'mvebu/dt' into mvebu/for-next) Merging omap/for-next (8e638875387f Merge tag 'omap-for-v4.2/wakeirq-drivers-v2' 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_7xx_data.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c Merging renesas/next (613915220fbc Merge branch 'heads/dt-for-v4.2' into next) Merging samsung/for-next (7585f44e561e Merge branch 'v4.2-next/dt64-samsung' into for-next) Merging sunxi/sunxi/for-next (11f9fb71e172 Merge branch 'sunxi/dt-for-4.2' into sunxi/for-next) Merging tegra/for-next (a9460d4a7ed1 Merge branch for-4.2/cpufreq into for-next) Merging arm64/for-next/core (822bf4833ecc arm64: defconfig: enable memtest) Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback) Merging cris/for-next (1e4d6e13d050 cris: don't use module_init for non-modular core eeprom.c code) Merging h8300/h8300-next (1c948ec63ab3 Merge branch 'h8300-next' of git.sourceforge.jp:/gitroot/uclinux-h8/linux into h8300-next) CONFLICT (content): Merge conflict in drivers/irqchip/Makefile CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next) Merging m68k/for-next (1214c525484c m68k: Use for_each_sg()) Merging m68knommu/for-next (73cb9dc0cd8d m68k: Use vsprintf %pM extension) Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg') Merging microblaze/next (c4fa9a6ae285 microblaze/PCI: Remove unnecessary struct pci_dev declaration) Merging mips/mips-for-linux-next (939bc40371c1 Merge branch '4.1-fixes' into mips-for-linux-next) CONFLICT (content): Merge conflict in drivers/tty/serial/8250/Makefile CONFLICT (content): Merge conflict in drivers/tty/serial/8250/Kconfig CONFLICT (content): Merge conflict in drivers/irqchip/Makefile CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig CONFLICT (content): Merge conflict in drivers/clk/Makefile Merging nios2/nios2-next (1a70db49a735 nios2: rework cache) Merging parisc-hd/for-next (4b470f120817 Merge branch 'parisc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) Merging powerpc-mpe/next (238abecde8ad powerpc: Don't use gcc specific options on clang) Merging powerpc/next (65e7bb2a34fe Merge branch 'next-sriov' into next) Merging fsl/next (f1b3b4450dcb powerpc/85xx: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (8cb81811e924 s390/keyboard: avoid off-by-one when using strnlen_user()) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (5316a64ce518 tile: avoid a "label not used" warning in do_page_fault()) Merging uml/linux-next (6c684465587a um: Fix warning in setup_signal_stack_si()) Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (ba155e2d21f6 Linux 4.1-rc5) Merging btrfs/next (e082f56313f3 btrfs: quota: Update quota tree after qgroup relationship change.) Merging ceph/master (84b54fefaa05 libceph: announce support for straw2 buckets) Merging cifs/for-next (843b06f1f0cb client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set) Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) Merging ext3/for_next (792352cb160e udf: fix udf_load_pvoldesc()) Merging ext4/dev (8b6d8f1be835 jbd2: get rid of open coded allocation retry loop) Merging f2fs/dev (3c4541452748 f2fs: do not trim preallocated blocks when truncating after i_size) Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) Merging fuse/for-next (780e2a3f06e7 fuse: update MAINTAINERS entry) Merging gfs2/for-next (86066914edff gfs2: Don't support fallocate on jdata files) Merging jfs/jfs-next (f7f31adf07d1 jfs: fix indentation on if statement) Merging nfs/linux-next (3438995bc439 Merge tag 'nfs-rdma-for-4.2' of git://git.linux-nfs.org/projects/anna/nfs-rdma) Merging nfsd/nfsd-next (185406191af5 nfsd: Allows user un-mounting filesystem where nfsd exports base on) Merging overlayfs/overlayfs-next (3ed6b3b4255d ovl: allow distributed fs as lower layer) Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) Merging ubifs/linux-next (98fb1ffd8154 UBI: block: Add missing cache flushes) Merging xfs/for-next (4ea79766168b Merge branch 'xfs-commit-cleanup' into for-next) Merging file-locks/linux-next (7505256626b0 Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux) Merging vfs/for-next (d61fb6115cdb Merge branch 'for-linus' into for-next) CONFLICT (content): Merge conflict in fs/namei.c CONFLICT (modify/delete): fs/hppfs/hppfs.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of fs/hppfs/hppfs.c left in tree. CONFLICT (content): Merge conflict in fs/ext4/symlink.c $ git rm -f fs/hppfs/hppfs.c Applying: f2fs: merge fix for follow_link changes Merging pci/next (bf933dbb8445 Merge branches 'pci/host-designware', 'pci/host-designware-common', 'pci/host-generic', 'pci/host-imx6', 'pci/host-iproc' and 'pci/host-xgene' into next) Merging hid/for-next (92206f554f9c Merge branch 'for-4.2/rmi' into for-next) Merging i2c/i2c/for-next (c3413f46e575 Merge branch 'i2c/for-4.2' into i2c/for-next) Merging jdelvare-hwmon/master (2b30464a2c87 hwmon: Document which I2C addresses can be probed) Merging dmi/master (bec755ee1080 firmware: dmi: struct dmi_header should be packed) Merging hwmon-staging/hwmon-next (f6725ae2f1ae hwmon: (ntc_thermistor) Improve precision of resistance calculation) Merging v4l-dvb/master (52d0f6e95987 Merge branch 'patchwork' into to_next) Merging kbuild/for-next (31d61069530b Merge branch 'kbuild/kconfig' into kbuild/for-next) Merging kconfig/for-next (bfa76d495765 Linux 3.19) Merging libata/for-next (9253987d5eac Merge branch 'for-4.2' into for-next) Merging pm/linux-next (5b58fe3a9afa Merge branches 'pm-domains' and 'pm-clk' into linux-next) Merging idle/next (a576d08d4eb2 Merge branches 'cpuidle' and 'turbostat' into release) Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging thermal/next (111b23cf895b Merge branches 'release' and 'thermal-soc' of .git into next) Merging thermal-soc/next (b89384e9e8c0 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 (023600f192be swiotlb: do not export map_single function) Merging slave-dma/next (abea4d0a025b Merge branch 'topic/xdmac' into next) Merging net-next/master (89d256bb69f2 bpf: disallow bpf tc programs access current->pid,uid) CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/main.c Merging ipsec-next/master (493be55ac3d8 xen-netfront: Use setup_timer) Merging wireless-drivers-next/master (40b503c76481 brcmfmac: make brcmf_p2p_detach() call conditional) Merging bluetooth/master (30811fa663d7 at86rf230: cleanup start and stop callbacks) Merging rdma/for-next (8e4349d13f33 IB/mad: Add final OPA MAD processing) CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/verbs.c CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/frwr_ops.c CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/sge.c CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx4/mad.c Merging mtd/master (e26081808eda Linux 4.1-rc4) Merging l2-mtd/master (e5babdf928e5 mtd: dc21285: use raw spinlock functions for nw_gpio_lock) CONFLICT (content): Merge conflict in MAINTAINERS Merging crypto/master (f4ec6aa5b018 crypto: caam - Provide correct value to iounmap() in controller driver) CONFLICT (content): Merge conflict in net/ipv6/esp6.c CONFLICT (content): Merge conflict in net/ipv4/esp4.c Merging drm/drm-next (284b2884a967 Merge tag 'omapdrm-4.2-atomic' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c Applying: drm/amdgpu: fix the build on big endian Merging drm-panel/drm/panel/for-next (4946b0430c69 drm/panel: simple: Add bus format for HannStar HSD100PXN1) Merging drm-intel/for-linux-next (41d232b7c891 drm/i915: Add SCRATCH1 and ROW_CHICKEN3 to the register whitelist.) Merging drm-tegra/drm/tegra/for-next (8a8005e3e199 drm/tegra: dpaux: Registers are 32-bit) Merging drm-misc/topic/drm-misc (9697dffb098d drm: Turn off Legacy Context Functions) Merging drm-exynos/exynos-drm/for-next (06f11fcd3f83 drm/exynos: ipp: validate a GEM handle with multiple planes) Merging drm-msm/msm-next (1a370be9ac51 drm/msm: restart queued submits after hang) Merging sound/for-next (d39513f85163 ALSA: HDAC: move SND_HDA_PREALLOC_SIZE to core) Merging sound-asoc/for-next (a495720f53d7 Merge remote-tracking branch 'asoc/topic/wm8741' into asoc-next) Merging modules/modules-next (6727bb9c6abe kernel/module.c: avoid ifdefs for sig_enforce declaration) Merging input/next (eeb64c14275e tty/vt/keyboard: define LED triggers for VT keyboard lock states) Merging block/for-next (7fc6069f4fd2 Merge branch 'for-4.2/drivers' into for-next) CONFLICT (content): Merge conflict in mm/page-writeback.c CONFLICT (content): Merge conflict in mm/backing-dev.c CONFLICT (content): Merge conflict in include/linux/blkdev.h CONFLICT (content): Merge conflict in drivers/md/dm.c CONFLICT (content): Merge conflict in drivers/block/nvme-core.c CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild CONFLICT (content): Merge conflict in MAINTAINERS Merging device-mapper/for-next (3fbf39cc36c0 dm stats: add support for request-based DM devices) Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (992f545ad897 mmc: queue: prevent soft lockups on PREEMPT=n) Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) Merging md/for-next (3bfd86ccbf1f md/raid5: ignore released_stripes check) Merging mfd/for-mfd-next (00479c6fe51f mfd: lpc_ich: Assign subdevice ids automatically) CONFLICT (content): Merge conflict in MAINTAINERS Merging backlight/for-backlight-next (a7f6d4571393 backlight: pwm_bl: Simplify usage of devm_gpiod_get_optional) Merging battery/master (85a5965e1dc5 wm831x_power: Fix off-by-one at free_irq()) Merging omap_dss2/for-next (9f5ddefdc979 fbdev: propagate result of fb_videomode_from_videomode()) Merging regulator/for-next (f0fc843db49f Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next) Merging security/next (d6f7aa27f41d Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next into next) CONFLICT (content): Merge conflict in security/security.c CONFLICT (modify/delete): security/capability.c deleted in security/next and modified in HEAD. Version HEAD of security/capability.c left in tree. CONFLICT (content): Merge conflict in include/linux/security.h $ git rm -f security/capability.c Applying: LSM: merge fix for follow_link API changes Merging integrity/next (24fd03c87695 ima: update builtin policies) Merging selinux/next (9fc2b4b436cf selinux: fix setting of security labels on NFS) Merging lblnet/next (b2776bf7149b Linux 3.18) Merging watchdog/master (e72cb910fd8d watchdog: da9062: DA9062 watchdog driver) CONFLICT (add/add): Merge conflict in drivers/watchdog/st_lpc_wdt.c CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig Merging iommu/next (49d25d04b661 Merge branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', 'default-domains' and 'core' into next) Merging dwmw2-iommu/master (c83b2f20fdde iommu/vt-d: Only enable extended context tables if PASID is supported) Merging vfio/next (20f300175a1e vfio/pci: Fix racy vfio_device_get_from_dev() call) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (f8785d94fc4e Merge branch 'doc/4.2' into docs-next) Merging trivial/for-next (79ce48df755e lpfc: Grammar s/an negative/a negative/) Merging audit/next (0b08c5e59441 audit: Fix check of return value of strnlen_user()) CONFLICT (content): Merge conflict in security/lsm_audit.c Merging devicetree/devicetree/next (ce32f859646b of/fdt: fix argument name and add comments of unflatten_dt_node()) Merging dt-rh/for-next (63a4aea55670 of: clean-up unnecessary libfdt include paths) Merging mailbox/mailbox-for-next (07a7dba17132 dt: mailbox: Remove 'mbox-names property is discouraged' message from binding) Merging spi/for-next (39adf0ad1cb4 Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/zynq' into spi-next) Merging tip/auto-latest (0033cf235e79 Merge branch 'x86/mm') CONFLICT (content): Merge conflict in include/linux/rcupdate.h CONFLICT (content): Merge conflict in drivers/iommu/intel_irq_remapping.c CONFLICT (content): Merge conflict in drivers/iommu/dmar.c CONFLICT (content): Merge conflict in drivers/crypto/vmx/ghash.c CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes_cbc.c CONFLICT (content): Merge conflict in drivers/crypto/vmx/aes.c CONFLICT (content): Merge conflict in drivers/clocksource/Makefile Applying: rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE() Merging clockevents/clockevents/next (645d558b1cd5 Merge branch 'clockevents/4.2' into clockevents/next) CONFLICT (add/add): Merge conflict in drivers/clocksource/timer-stm32.c CONFLICT (content): Merge conflict in drivers/clocksource/Makefile Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX) Merging edac-amd/for-next (31fec261002e EDAC, altera: Do not allow suspend when EDAC is enabled) CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/tile/Kconfig CONFLICT (content): Merge conflict in arch/arm64/boot/dts/apm/apm-storm.dtsi 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 (33d657d13810 ring-buffer-benchmark: Fix the wrong type) Merging rcu/rcu/next (66709041ffca cpu: Wait for RCU grace periods concurrently) Merging kvm/linux-next (e80a4a9426ad KVM: x86: mark legacy PCI device assignment as deprecated) CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h Applying: kvm: bad merge fix patch for arch/x86/kvm/cpuid.c Merging kvm-arm/next (3520469d65f2 KVM: export __gfn_to_pfn_memslot, drop gfn_to_pfn_async) Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) Merging kvms390/next (ea2cdd27dce6 KVM: s390: introduce KMSG_COMPONENT for kvm-s390) Merging xen-tip/linux-next (ffb7dbed47da xen/arm: Define xen_arch_suspend()) Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) Merging workqueues/for-next (402dd89d6cdb workqueue: fix typos in comments) Merging drivers-x86/for-next (9330dcdd918a samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister) CONFLICT (content): Merge conflict in drivers/platform/x86/ideapad-laptop.c Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address) Merging regmap/for-next (970284e6d6f5 Merge remote-tracking branches 'regmap/topic/defaults', 'regmap/topic/irq' and 'regmap/topic/reg-params' into regmap-next) Merging hsi/for-next (1269594a93bb HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction) Merging leds/for-next (e0dd268a2c98 leds: aat1290: pass flags parameter to devm_gpiod_get) Merging ipmi/for-next (cc5c8d2cc014 ipmi: Make some data const that was only read) Merging driver-core/driver-core-next (0e6c861f73ec Revert "base/platform: Only insert MEM and IO resources") Merging tty/tty-next (48a6092fb41f serial: stm32-usart: Add STM32 USART Driver) Merging usb/usb-next (50641056d833 usb: dwc3: Use ASCII space in Kconfig) CONFLICT (content): Merge conflict in drivers/phy/Makefile Merging usb-gadget/next (e18b7975c885 usb: dwc3: gadget: don't clear EP_BUSY too early) Merging usb-serial/usb-next (f05b7cb6f2be USB: serial: mos7840: Use setup_timer) Merging staging/staging-next (08c40197479f staging: rtl8188eu: kill unused INCLUDE_MULTI_FUNC_* macros) CONFLICT (content): Merge conflict in tools/Makefile CONFLICT (modify/delete): drivers/staging/media/dt3155v4l/dt3155v4l.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/dt3155v4l/dt3155v4l.c left in tree. CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c $ git rm -f drivers/staging/media/dt3155v4l/dt3155v4l.c Applying: staging: wilc1000: fix call to cfg80211_disconnecteddue to API change Applying: staging: disable the WILC1000 driver Merging char-misc/char-misc-next (5069288bd477 MAINTAINERS: mei: add mei_cl_bus.h to maintained file list) CONFLICT (content): Merge conflict in include/linux/mfd/axp20x.h CONFLICT (content): Merge conflict in include/dt-bindings/mfd/arizona.h Applying: power: axp288_charger: fix for API change Merging extcon/extcon-next (f8df88081183 extcon: Remove optional print_name() function pointer of extcon_dev) Merging kdbus/kdbus (cf15adc8b481 kdbus: use FIELD_SIZEOF in kdbus_member_set_user macro) Merging cgroup/for-next (4d205676c102 MAINTAINERS: add a cgroup core co-maintainer) Merging scsi/for-next (24136f2c0b3b snic: driver for Cisco SCSI HBA) CONFLICT (content): Merge conflict in drivers/target/target_core_user.c Merging target-updates/for-next (0fb1f14e88f6 xen-scsiback: Fix compile warning for 64-bit LUN) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging pinctrl/for-next (323de9efdf3e pinctrl: make pinctrl_register() return proper error code) Merging vhost/linux-next (fa5f6add30c7 tun, macvtap: higher order allocations for skbs) Merging remoteproc/for-next (172e6ab1caff remoteproc: fix various checkpatch warnings) Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) Merging gpio/for-next (f35bbf61ab77 gpio / ACPI: Return -EPROBE_DEFER if the gpiochip was not found) Merging dma-mapping/dma-mapping-next (5ebe6afaf005 Linux 4.1-rc2) Merging pwm/for-next (361c1066c939 pwm: lpss: pci: Add support for Broxton platform) Merging dma-buf/for-next (5136629dc5a1 dma-buf: Minor coding style fixes) Merging userns/for-next (c97648cb2f34 mnt: Update fs_fully_visible to test for permanently empty directories) CONFLICT (content): Merge conflict in include/linux/fs.h CONFLICT (content): Merge conflict in fs/libfs.c CONFLICT (content): Merge conflict in drivers/firmware/efi/efi.c Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) Merging clk/clk-next (46965688acd0 clk: meson: add some error handling in meson_clk_register_cpu()) CONFLICT (content): Merge conflict in drivers/clk/Makefile 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 (390db010c960 selftest, x86: fix incorrect comment) 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 (507a76d5f701 Merge branch 'for-4.1/upstream-fixes' into for-next) Merging coresight/next (486ea46dfc88 coresight-etm3x: Add Qualcomm PTM v1.1 peripheral ID) CONFLICT (add/add): Merge conflict in drivers/hwtracing/coresight/coresight-replicator-qcom.c CONFLICT (add/add): Merge conflict in drivers/hwtracing/coresight/coresight-etm4x.c CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c Merging rtc/rtc-next (ba8d134e75de rtc: ds1307: Enable the mcp794xx alarm after programming time) Merging init/init-v4.1-rc6 (bc3e452003d0 module: relocate module_init from init.h to module.h) CONFLICT (content): Merge conflict in arch/arm/mach-keystone/platsmp.c CONFLICT (modify/delete): arch/arm/mach-hisi/headsmp.S deleted in HEAD and modified in init/init-v4.1-rc6. Version init/init-v4.1-rc6 of arch/arm/mach-hisi/headsmp.S left in tree. $ git rm -f arch/arm/mach-hisi/headsmp.S Applying: drivers/hwtracing: fix coresight-replicator-qcom implicit <module.h> usage Applying: drivers/hwtracing: fix coresight-etm4x implicit <module.h> usage Merging akpm-current/current (4ace53bb3d31 scsi-resolve-sg-buffer-const-ness-issue-fix) CONFLICT (content): Merge conflict in fs/ufs/namei.c CONFLICT (content): Merge conflict in drivers/staging/android/lowmemorykiller.c CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c CONFLICT (content): Merge conflict in arch/x86/kernel/machine_kexec_64.c CONFLICT (content): Merge conflict in arch/x86/Kconfig $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/block/nvme-core.c: fix build with gcc-4.4.4 Applying: drivers/gpu/drm/i915/intel_sprite.c: fix build Applying: drivers/gpu/drm/i915/intel_tv.c: fix build Applying: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR Applying: printk: improve the description of /dev/kmsg line format Applying: kernel/relay.c: use kvfree() in relay_free_page_array() Applying: cxgb3: use kvfree() in cxgb_free_mem() Applying: cxgb4: use kvfree() in t4_free_mem() Applying: drm: use kvfree() in drm_free_large() Applying: drm/nouveau/gem: use kvfree() in u_free() Applying: IB/ehca: use kvfree() in ipz_queue_{cd}tor() Applying: target: use kvfree() in session alloc and free Applying: libcxgbi: use kvfree() in cxgbi_free_big_mem() Applying: bcache: use kvfree() in various places Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void Applying: MAINTAINERS: update Emulex ocrdma email addresses Applying: MAINTAINERS: remove website for paride Applying: MAINTAINERS: update sound soc intel patterns Applying: MAINTAINERS: update brcm dts pattern Applying: MAINTAINERS: update brcm gpio filename pattern Applying: MAINTAINERS: remove unused nbd.h pattern Applying: MAINTAINERS: move Jens Osterkamp to CREDITS Applying: MAINTAINERS: BCACHE: Kent Overstreet has changed email address Applying: MAINTAINERS: add zpool Applying: x86: opt into HAVE_COPY_THREAD_TLS, for both 32-bit and 64-bit Applying: drivers/w1/w1_int.c: call put_device if device_register fails Merging akpm/master (4ee10b1f0df8 drivers/w1/w1_int.c: call put_device if device_register fails) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
