Hi all, Changes since 20160720: The xfs tree gained a conflict against Linus' tree. The net-next tree gained a conflict against the net tree. The l2-mtd tree lost its build failure. The crypto tree lost its build failure. The kspp tree gained a conflict against the arm64 tree. The block tree gained a conflict against Linus' tree. The device-mapper tree gained a conflict against the block tree. The kvm tree gained a conflict against the powerpc tree. The nvdimm tree gained a build failure so I used the version from next-20160720. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 10587 9749 files changed, 534253 insertions(+), 187882 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 (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig (this fails its final link) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 239 trees (counting Linus' and 35 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 $ git checkout master $ git reset --hard stable Merging origin/master (47ef4ad2684d Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd) Merging fixes/master (5edb56491d48 Linux 4.7-rc3) Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled) Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization) Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging powerpc-fixes/fixes (bfa37087aa04 powerpc: Initialise pci_io_base as early as possible) Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (882b0f2fba83 net/mlx5e: Fix del vxlan port command buffer memset) Merging ipsec/master (1ba5bf993c6a xfrm: fix crash in XFRM_MSG_GETSA netlink handler) Merging netfilter/master (ea43f860d984 Merge branch 'ethoc-fixes') Merging ipvs/master (3777ed688fba ipvs: fix bind to link-local mcast IPv6 address in backup) Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git) Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation) Merging sound-current/for-linus (76df52969711 ALSA: usb-audio: Fix quirks code is not called) Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) Merging driver-core.current/driver-core-linus (92d21ac74a9e Linux 4.7-rc7) Merging tty.current/tty-linus (a99cde438de0 Linux 4.7-rc6) Merging usb.current/usb-linus (a99cde438de0 Linux 4.7-rc6) Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (a99cde438de0 Linux 4.7-rc6) Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4) Merging input-current/for-linus (6a5029e66404 Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle) Merging crypto-current/master (055ddaace035 crypto: user - re-add size check for CRYPTO_MSG_GETALG) Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read) Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API) Merging drm-intel-fixes/for-linux-next-fixes (ed2eebbd61af drm/i915: add missing condition for committing planes on crtc) Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) Merging arc/for-next (b4dff2874006 ARC: dma: fix address translation in arc_dma_free) Merging arm/for-next (bf9cb4359182 Merge branches 'component', 'cpuidle', 'fixes' and 'misc' into for-next) Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1) Merging arm-soc/for-next (08686a9fd33e arm-soc: document merge) Merging amlogic/for-next (4d9b3db03bd4 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild) Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next) Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next) Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) Merging imx-mxs/for-next (63a404a3f177 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next) Merging mvebu/for-next (feaf6b0beba8 Merge branch 'mvebu/defconfig64' into mvebu/for-next) Merging omap/for-next (01eab0a3b919 Merge tag 'omap-for-v4.8/defconfig-v2-signed' into for-next) Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) Merging qcom/for-next (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes) Merging renesas/next (e1ebb0d1a9a8 Merge branch 'heads/dt-fixes-for-v4.8' into next) Merging rockchip/for-next (ebbfb5d5627d Merge branch 'v4.8-armsoc/dts64' into for-next) Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1) Merging samsung-krzk/for-next (253256f64294 Merge branch 'next/soc' into for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi Merging tegra/for-next (6083e0f837ac Merge branch for-4.8/arm64/defconfig into for-next) Merging arm64/for-next/core (2572214170fb arm64: debug: remove unused local_dbg_{enable, disable} macros) CONFLICT (content): Merge conflict in arch/arm64/mm/fault.c Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock) Merging m68k/for-next (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2) Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4) Merging metag/for-next (fb2bb461e2d8 metag: Remove duplicate KERN_<LEVEL> prefix) Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) Merging mips/mips-for-linux-next (d117d8edaf68 Merge branch '4.7-fixes' into mips-for-linux-next) Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target) Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) Merging powerpc/next (e2413a7dae52 PCI: rpaphp: Fix slot registration for multiple slots under a PHB) Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) Merging fsl/next (26258cc763c5 powerpc/fsl-pci: Use fsl_guts_get_svr()) CONFLICT (content): Merge conflict in drivers/soc/Kconfig Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) Merging s390/features (64a40c84001e s390/pci: Delete an unnecessary check before the function call "pci_dev_put") Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (893d66192c46 tile: support gcc 7 optimization to use __multi3) Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support) Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted) Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) Merging btrfs/next (bac357dcec29 Btrfs: avoid deadlocks during reservations in btrfs_truncate_block) Merging btrfs-kdave/for-next (701aa322c418 Fixup: fs_info/root cleanups and qgroups patches) Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache) Merging cifs/for-next (bd975d1eead2 cifs: fix crash due to race in hmac(md5) handling) Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error) Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it) Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally) Merging ext4/dev (7bc949164511 ext4: verify extent header depth) Merging f2fs/dev (363cad7f7e58 f2fs: avoid memory allocation failure due to a long length) Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) Merging fuse/for-next (7879c4e58b7c fuse: improve aio directIO write performance for size extending writes) Merging gfs2/for-next (44f52122a220 GFS2: Check rs_free with rd_rsspin protection) Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) Merging nfs/linux-next (3e36eaa4799f Merge branch 'nfs-rdma') Merging nfsd/nfsd-next (96c35631204c SUNRPC: change UDP socket space reservation) Merging orangefs/for-next (78fee0b6846f orangefs: fix namespace handling) Merging overlayfs/overlayfs-next (3ca57010e1ba locks: fix file locking on overlayfs) Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) Merging ubifs/linux-next (4ac1c17b2044 UBIFS: Implement ->migratepage()) Merging xfs/for-next (dc4113d2433e Merge branch 'xfs-4.8-dir2-sf-fixes' into for-next) CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) Merging vfs/for-next (b223f4e215b3 Merge branch 'd_real' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into work.misc) CONFLICT (content): Merge conflict in fs/nfs/dir.c Merging pci/next (e0af5a975e77 Merge branch 'pci/resource' into next) CONFLICT (content): Merge conflict in drivers/pci/host/pci-tegra.c CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings) Merging hid/for-next (de1bcd764ea0 Merge branch 'for-4.8/upstream' into for-next) Merging i2c/i2c/for-next (2c32e9ed5dcb Merge branch 'i2c/for-4.8' into i2c/for-next) Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440) Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register) Merging hwmon-staging/hwmon-next (b53893aae441 hwmon: (adt7411) set bit 3 in CFG1 register) Merging v4l-dvb/master (7df7922fa649 Merge branch 'topic/docs-next' into to_next) Merging pm/linux-next (15ad7523a30a Merge branches 'pm-devfreq' and 'pm-cpu' into linux-next) Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy) Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next) CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_sysfs.c CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_helpers.c CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy) Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) Merging slave-dma/next (b1a4e336d500 Merge branch 'topic/dmaengine_cleanups' into next) Merging net-next/master (c0d661ca3701 Merge branch 'mlxsw-per-prio-tc-counters') CONFLICT (content): Merge conflict in net/sctp/input.c CONFLICT (content): Merge conflict in net/sched/sch_htb.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/en_ethtool.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/i40e/i40e_main.c CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h CONFLICT (content): Merge conflict in drivers/net/ethernet/cavium/liquidio/lio_main.c CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) Merging netfilter-next/master (6e1f760e13c7 netfilter: nf_tables: allow to filter out rules by table and chain) Merging ipvs-next/master (be2cef49904b ipvs: count pre-established TCP states as active) Merging wireless-drivers-next/master (cb6a11518850 wlcore: spi: fix build warning caused by redundant variable) Merging bluetooth/master (e7acf43024e9 Bluetooth: btmrvl: reset is_suspending flag in failure path) Merging mac80211-next/master (7d27a0ba7adc cfg80211: Add mesh peer AID setting API) Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8) Merging rdma-leon/rdma-next (4c2e07c6a29e Linux 4.7-rc5) Merging rdma-leon-test/testing/rdma-next (92d21ac74a9e Linux 4.7-rc7) Merging mtd/master (7ce9ea7e6b35 mtd: nand: omap2: Add check for old elm binding) Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM) CONFLICT (content): Merge conflict in drivers/mtd/devices/Kconfig Merging nand/nand/next (8490c03bd9d4 mtd: nand: jz4780: Update MODULE_AUTHOR email address) Merging crypto/master (16dee78005be crypto: vmx - Fix aes_p8_xts_decrypt build failure) Merging drm/drm-next (0cf09031540c Merge branch 'drm_bridge_for_4.8' of https://github.com/boddob/linux into drm-next) CONFLICT (content): Merge conflict in drivers/media/platform/omap/omap_voutdef.h CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/rockchip/rockchip_drm_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c CONFLICT (content): Merge conflict in Documentation/index.rst Applying: drm/i915/opregion: fix up for argument change Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel) Merging drm-intel/for-linux-next (fa95986095e3 drm/i915: Set legacy properties when using legacy gamma set IOCTL. (v2)) Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes) Merging drm-misc/topic/drm-misc (29d79ede4edc GPU-DRM-sun4i: Delete an unnecessary check before drm_fbdev_cma_hotplug_event()) Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) Merging drm-msm/msm-next (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference()) Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs) Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver) Merging sunxi/sunxi/for-next (25d6a931b3f3 Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next) Merging kbuild/for-next (8f59bd8c154e Merge branch 'kbuild/misc' into kbuild/for-next) Applying: gcc-plugins: disable under COMPILE_TEST Merging kspp/for-next/kspp (c802d8b16509 mm: SLUB hardened usercopy support) CONFLICT (content): Merge conflict in arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/arm64/include/asm/uaccess.h Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") Merging regmap/for-next (efeb1a3ab91d Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', 'regmap/topic/iopoll', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next) Merging sound/for-next (275353bb684e ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members) Merging sound-asoc/for-next (4963cc0bf3a4 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next) Merging modules/modules-next (9fc3d73bedc7 module: Do a WARN_ON_ONCE() for assert module mutex not held) Merging input/next (0097ff3d5dad Input: tty/vt/keyboard - use memdup_user()) Merging block/for-next (3956905077dd Merge branch 'for-4.8/drivers' into for-next) CONFLICT (content): Merge conflict in fs/f2fs/segment.c CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (modify/delete): fs/ext4/crypto.c deleted in HEAD and modified in block/for-next. Version block/for-next of fs/ext4/crypto.c left in tree. CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/compression.c CONFLICT (content): Merge conflict in drivers/block/xen-blkfront.c CONFLICT (content): Merge conflict in block/blk-lib.c $ git rm -f fs/ext4/crypto.c Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next) Merging device-mapper/for-next (342983f08e0e dm: allow bio-based table to be upgraded to bio-based with DAX support) CONFLICT (content): Merge conflict in include/linux/blkdev.h CONFLICT (content): Merge conflict in drivers/md/dm.c Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) Merging mmc-uh/next (3e7aa4e78748 mmc: core: Extend sysfs with DSR register) Merging md/for-next (0e5313e2d4ef raid10: improve random reads performance) CONFLICT (content): Merge conflict in drivers/md/raid10.c CONFLICT (content): Merge conflict in drivers/md/raid1.c Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size) Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator) Merging battery/master (4fcd504edbf7 power: reset: add reboot mode driver) Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module) Merging regulator/for-next (a485f5fc8c8e Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next) Merging security/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family)) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt Merging integrity/next (544e1cea03e6 ima: extend the measurement entry specific pcr) Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next) Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.) Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family)) Merging watchdog/master (e035d8f787b1 watchdog: sbsa: Drop status function) Merging iommu/next (a9f890f46e6a Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next) CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) Merging vfio/next (0991bbdbf5b8 vfio: platform: check reset call return code during release) Merging jc_docs/docs-next (29310a50752d Revert "doc/sphinx: Enable keep_warnings") Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries) Merging audit/next (43761473c254 audit: fix a double fetch in audit_log_single_execve_arg()) CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c Merging devicetree/for-next (1d1bde550ea3 of: fdt: mark unflattened tree as detached) CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx51.c CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c CONFLICT (content): Merge conflict in arch/arc/kernel/setup.c Merging mailbox/mailbox-for-next (9ac3e85a5c5c mailbox: pl320: remove __raw IO) Merging spi/for-next (d28f0dfdb432 Merge remote-tracking branches 'spi/topic/topcliff-pch', 'spi/topic/txx9' and 'spi/topic/xilinx' into spi-next) Merging perf/perf/core (5048c2af078d Merge tag 'perf-core-for-mingo-20160718' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core) Applying: tools: Simplify __BITS_PER_LONG define Merging tip/auto-latest (e1c0eec8fdf5 Merge branch 'x86/urgent') CONFLICT (content): Merge conflict in arch/x86/kernel/x86_init.c CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig CONFLICT (content): Merge conflict in arch/arm/Kconfig Applying: clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM" Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check) Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) Merging edac-amd/for-next (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry) Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next) Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines) Merging rcu/rcu/next (fbbede99476f rcu: don't use modular infrastructure in non-modular code) CONFLICT (content): Merge conflict in kernel/rcu/tree.c Merging kvm/linux-next (af1bae5497b9 KVM: x86: bump KVM_MAX_VCPU_ID to 1023) CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c CONFLICT (content): Merge conflict in arch/s390/mm/gmap.c CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/idle_book3s.S CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile CONFLICT (content): Merge conflict in arch/powerpc/include/asm/paca.h Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c Applying: s390: merge fix up for __diag204 move Merging kvm-arm/next (3a88bded2035 KVM: arm64: vgic-its: Simplify MAPI error handling) CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c CONFLICT (modify/delete): virt/kvm/arm/vgic.c deleted in kvm-arm/next and modified in HEAD. Version HEAD of virt/kvm/arm/vgic.c left in tree. CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h CONFLICT (content): Merge conflict in include/linux/irqchip/arm-gic-v3.h $ git rm -f virt/kvm/arm/vgic.c Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) Merging kvm-ppc-paulus/kvm-ppc-next (fd7bacbca47a KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt) Merging kvms390/next (9acc317b183f KVM: s390: let ptff intercepts result in cc=3) CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h Merging xen-tip/linux-next (6ba286ad8457 xen: support runqueue steal time on xen) CONFLICT (content): Merge conflict in drivers/acpi/scan.c CONFLICT (content): Merge conflict in arch/arm/xen/enlighten.c Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction) Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads) Merging drivers-x86/for-next (df2294fb6428 intel_pmc_core: Convert to DEFINE_DEBUGFS_ATTRIBUTE) Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe) Merging leds/for-next (5706c01fcfb3 leds: is31fl32xx: define complete i2c_device_id table) Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init) Merging driver-core/driver-core-next (92d21ac74a9e Linux 4.7-rc7) Merging tty/tty-next (67417f9c262e Merge 4.7-rc6 into tty-next) Merging usb/usb-next (a1ca2c6b2924 usb: musb: sunxi: Simplify dr_mode handling) Applying: staging: emxx_udc: allow modular build Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable()) Merging usb-serial/usb-next (3161da970d38 USB: serial: use variable for status) Merging usb-chipidea-next/ci-for-usb-next (ebfad91c5da3 dt-bindings: ci-hdrc-usb2: s/gadget-itc-setting/itc-setting in example) Merging staging/staging-next (6c71ee3b6157 Merge tag 'iio-for-4.8c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree. CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree. $ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h Applying: staging/android: merge fix up for sync.h renaming Merging char-misc/char-misc-next (45c7d71e1675 Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing) Merging extcon/extcon-next (fa1723bb3461 extcon: arizona: Remove unneeded semi-colon) Merging cgroup/for-next (1cab4a96cab6 Merge branch 'for-4.8' into for-next) CONFLICT (content): Merge conflict in kernel/cgroup.c Merging scsi/for-next (fcbefc3b2bfb scsi: ufs: remove unnecessary goto label) Merging target-updates/for-next (1a9b9846e904 target: fix spelling mistake: "limitiation" -> "limitation") Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) Merging libata/for-next (9e4bc77c45ba Merge branch 'for-4.8' into for-next) Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) Merging pinctrl/for-next (25af8bfa9693 pinctrl: Add STM32F746 MCU support) Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool) Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) Merging rpmsg/for-next (e937b335a738 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (4287d2aea9bf MAINTAINERS: Add INTEL MERRIFIELD GPIO entry) Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) Merging pwm/for-next (9637e7e0403a Merge branch 'for-4.8/regulator' into for-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig Merging userns/for-next (81754357770e fs: Update i_[ug]id_(read|write) to translate relative to s_user_ns) CONFLICT (content): Merge conflict in fs/proc/root.c CONFLICT (content): Merge conflict in fs/posix_acl.c Applying: proc: fixup for "prevent stacking filesystems on top" Merging ktest/for-next (2dcd0af568b0 Linux 4.6) Merging clk/clk-next (b328d2c110ad clk: Makefile: re-sort and clean up) Merging aio/master (b562e44f507e Linux 4.5) Merging kselftest/next (cde07f453bed selftests: media_tests - Add media_device_open to .gitignore) Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times) Merging luto-misc/next (2dcd0af568b0 Linux 4.6) Merging borntraeger/linux-next (b562e44f507e Linux 4.5) Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next) Merging coresight/next (7c844fbeb7ce coresight: etm4x: remove duplicated include from coresight-etm4x.c) Merging rtc/rtc-next (bb9dbb01bef9 rtc: hym8563: in .read_alarm set .tm_sec to 0 to signal minute accuracy) CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi_64.c Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) Merging nvdimm/libnvdimm-for-next (50e853938a46 Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next) CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c $ git reset --hard HEAD^ Merging next-20160720 version of nvdimm CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c [master c6c6a476d2c8] next-20160720/nvdimm Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) Merging akpm-current/current (bb51d6b889b4 ipc/msg.c: use freezable blocking call) CONFLICT (content): Merge conflict in mm/page_alloc.c CONFLICT (content): Merge conflict in include/linux/thread_info.h CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree. $ git rm -f arch/arm/configs/bcm_defconfig $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression Applying: drivers/fpga/Kconfig: fix build failure Applying: tree-wide: replace config_enabled() with IS_ENABLED() Applying: include/linux/bitmap.h: cleanup Applying: powerpc: add explicit #include <asm/asm-compat.h> for jump label Applying: sparc: support static_key usage in non-module __exit sections Applying: tile: support static_key usage in non-module __exit sections Applying: arm: jump label may reference text in __exit Applying: jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL Applying: dynamic_debug: add jump label support Applying: ipc/sem.c: Fix complex_count vs. simple op race Applying: ipc-semc-fix-complex_count-vs-simple-op-race-update Applying: ipc/sem.c: remove duplicated memory barriers Applying: ipc/sem: sem_lock with hysteresis Applying: media: mtk-vcodec: remove unused dma_attrs Applying: dma-mapping: use unsigned long for dma_attrs Applying: alpha: dma-mapping: use unsigned long for dma_attrs Applying: arc: dma-mapping: use unsigned long for dma_attrs Applying: ARM: dma-mapping: use unsigned long for dma_attrs Applying: arm64: dma-mapping: use unsigned long for dma_attrs Applying: avr32: dma-mapping: use unsigned long for dma_attrs Applying: blackfin: dma-mapping: use unsigned long for dma_attrs Applying: c6x: dma-mapping: use unsigned long for dma_attrs Applying: cris: dma-mapping: use unsigned long for dma_attrs Applying: frv: dma-mapping: use unsigned long for dma_attrs Applying: drm/exynos: dma-mapping: use unsigned long for dma_attrs Applying: drm/mediatek: dma-mapping: use unsigned long for dma_attrs Applying: drm/msm: dma-mapping: use unsigned long for dma_attrs Applying: drm/nouveau: dma-mapping: use unsigned long for dma_attrs Applying: drm/rockship: dma-mapping: use unsigned long for dma_attrs Applying: infiniband: dma-mapping: use unsigned long for dma_attrs Applying: iommu: dma-mapping: use unsigned long for dma_attrs Applying: media: dma-mapping: use unsigned long for dma_attrs Applying: xen: dma-mapping: use unsigned long for dma_attrs Applying: swiotlb: dma-mapping: use unsigned long for dma_attrs Applying: powerpc: dma-mapping: use unsigned long for dma_attrs Applying: video: dma-mapping: use unsigned long for dma_attrs Applying: x86: dma-mapping: use unsigned long for dma_attrs Applying: iommu: intel: dma-mapping: use unsigned long for dma_attrs Applying: h8300: dma-mapping: use unsigned long for dma_attrs Applying: hexagon: dma-mapping: use unsigned long for dma_attrs Applying: ia64: dma-mapping: use unsigned long for dma_attrs Applying: m68k: dma-mapping: use unsigned long for dma_attrs Applying: metag: dma-mapping: use unsigned long for dma_attrs Applying: microblaze: dma-mapping: use unsigned long for dma_attrs Applying: mips: dma-mapping: use unsigned long for dma_attrs Applying: mn10300: dma-mapping: use unsigned long for dma_attrs Applying: nios2: dma-mapping: use unsigned long for dma_attrs Applying: openrisc: dma-mapping: use unsigned long for dma_attrs Applying: parisc: dma-mapping: use unsigned long for dma_attrs Applying: misc: mic: dma-mapping: use unsigned long for dma_attrs Applying: s390: dma-mapping: use unsigned long for dma_attrs Applying: sh: dma-mapping: use unsigned long for dma_attrs Applying: sparc: dma-mapping: use unsigned long for dma_attrs Applying: tile: dma-mapping: use unsigned long for dma_attrs Applying: unicore32: dma-mapping: use unsigned long for dma_attrs Applying: xtensa: dma-mapping: use unsigned long for dma_attrs Applying: remoteproc: qcom: use unsigned long for dma_attrs Applying: dma-mapping: remove dma_get_attr Applying: dma-mapping: document the DMA attributes next to the declaration Merging akpm/master (fc233cabc593 dma-mapping: document the DMA attributes next to the declaration) -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
