Hi all, Changes since 20160623: The net-next tree gained a conflict against the net tree. The block tree gained a conflict against the btrfs-kdave tree. The crypto tree gained a build failure for which I applied a fix patch. The userns tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 5285 5058 files changed, 222878 insertions(+), 98275 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 234 trees (counting Linus' and 34 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 (da01e18a37a5 x86: avoid avoid passing around 'thread_info' in stack dumping code) Merging fixes/master (5edb56491d48 Linux 4.7-rc3) Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) Merging arc-current/for-curr (5edb56491d48 Linux 4.7-rc3) Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent) Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) Merging powerpc-fixes/fixes (844e3be47693 powerpc/bpf/jit: Disable classic BPF JIT on ppc64le) 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 (c40e4096bf0a MAINTAINERS: Update Mellanox's mlx4 Eth NIC driver entry) Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) Merging ipvs/master (370a8107e788 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 (3d5fdff46c4b wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel) Merging sound-current/for-linus (c9058d43d994 ALSA: hda/tegra: iomem fixups for sparse warnings) Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code) Merging driver-core.current/driver-core-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging tty.current/tty-linus (33688abb2802 Linux 4.7-rc4) Merging usb.current/usb-linus (33688abb2802 Linux 4.7-rc4) Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) Merging usb-serial-fixes/usb-linus (33688abb2802 Linux 4.7-rc4) Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm) Merging staging.current/staging-linus (df013212a1b6 Merge tag 'iio-fixes-for-4.7b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) Merging char-misc.current/char-misc-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) Merging input-current/for-linus (226ba707744a Input: elantech - add more IC body types to the list) 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 (59461c018204 mfd: max77620: Fix FPS switch statements) Merging drm-intel-fixes/for-linux-next-fixes (1e3fa0acfec6 drm/i915/fbc: Disable on HSW by default for now) Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) Merging arc/for-next (5edb56491d48 Linux 4.7-rc3) Merging arm/for-next (f07617e99523 Merge branches 'component', 'fixes' and 'misc' into for-next) Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs) Merging arm-soc/for-next (ea371ddc86ff ARM: SoC: Document merges) Merging amlogic/for-next (cc989c0bfd53 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 (1a695a905c18 Linux 4.7-rc1) Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) Merging imx-mxs/for-next (b2f6951491c7 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next) Merging mvebu/for-next (56454a34f5d6 Merge branch 'mvebu/defconfig64' into mvebu/for-next) Merging omap/for-next (a68816dc4006 Merge branch 'omap-for-v4.8/soc' into for-next) Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) Merging qcom/for-next (275804c07f41 firmware: qcom: scm: Peripheral Authentication Service) Merging renesas/next (58ad5755a31c Merge branch 'heads/arm64-dt-for-v4.8' into next) Merging rockchip/for-next (3c77879bcab7 Merge branch 'v4.8-armsoc/dts64' into for-next) Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) Merging samsung-krzk/for-next (d054c56bd6a0 Merge branch 'next/soc' into for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi Merging tegra/for-next (5bcc7efc04c3 Merge branch for-4.8/arm64 into for-next) Merging arm64/for-next/core (d770b5a04790 Revert "arm64: Add support ARCH_SUPPORTS_INT128") 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 (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4) Merging metag/for-next (592ddeeff8cb metag: Fix typos) Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style) 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 (9497a1c1c5b4 powerpc/powernv: Print correct PHB type names) Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition) Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) Merging s390/features (63bf903583d7 Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL") Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (ca768667d873 tile 32-bit big-endian: fix bugs in syscall argument order) 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 (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7) Merging btrfs-kdave/for-next (5027553b087e Merge branch 'for-next-next-4.7-20160623' into for-next-20160623) Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache) Merging cifs/for-next (3bdc426e2497 cifs: dynamic allocation of ntlmssp blob) Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions) Merging ecryptfs/next (40f0fd372a62 ecryptfs: fix spelling mistakes) Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally) Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO) Merging f2fs/dev (a2481adac819 f2fs: avoid latency-critical readahead of node pages) Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) Merging fuse/for-next (507c552aa58f fuse: improve aio directIO write performance for size extending writes) Merging gfs2/for-next (1e875f5a95a2 gfs2: Initialize iopen glock holder for new inodes) Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) Merging nfs/linux-next (4d3a8386aeb2 Merge branch 'writeback') Merging nfsd/nfsd-next (ee8f2a36a99c nfsd: allow nfsd to advertise multiple layout types) Merging orangefs/for-next (2dcd0af568b0 Linux 4.6) Merging overlayfs/overlayfs-next (f920c41f047a ovl: move some common code in a function) 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 (f477cedc4e79 Merge branch 'xfs-4.8-misc-fixes-2' into for-next) Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next) Merging pci/next (e0af5a975e77 Merge branch 'pci/resource' into next) 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 (70f758b5bac8 Merge branch 'for-4.8/alps' into for-next) Merging i2c/i2c/for-next (d86a4c24d68e Merge branch 'i2c/for-current' into i2c/for-next) Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440) Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) Merging hwmon-staging/hwmon-next (d4db8217f4b7 hwmon: (dell-smm) In debug mode log duration of SMM calls) Merging v4l-dvb/master (2ed52999aaf3 Merge branch 'patchwork' into to_next) Merging pm/linux-next (e9a4387a0db4 Merge branch 'pm-devfreq-fixes' 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 (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next) CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster()) Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) Merging slave-dma/next (73a14400c949 Merge branch 'topic/xilinx' into next) Merging net-next/master (dc14341ed6b4 Merge tag 'wireless-drivers-next-for-davem-2016-06-21' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next) CONFLICT (content): Merge conflict in tools/virtio/ringtest/Makefile CONFLICT (content): Merge conflict in net/rds/tcp_listen.c CONFLICT (content): Merge conflict in net/rds/tcp_connect.c CONFLICT (content): Merge conflict in drivers/net/vrf.c CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qed/qed_hsi.h 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 ipvs-next/master (625b44fc15f8 ipvs: count pre-established TCP states as active) Merging wireless-drivers-next/master (1bb57c8a5e33 Merge ath-next from ath.git) Merging bluetooth/master (0e9390ebf1fe Merge branch 'mlxsw-next') Merging mac80211-next/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle') 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 (33688abb2802 Linux 4.7-rc4) Merging rdma-leon-test/testing/rdma-next (33688abb2802 Linux 4.7-rc4) Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings) Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks) Merging nand/nand/next (ba6f6d603b45 mtd: nandbiterrs: Support for NAND biterrors test on platforms without raw write) Merging crypto/master (3c4b23901a0c crypto: ecdh - Add ECDH software support) Merging drm/drm-next (a0877f520352 Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback) Merging drm-intel/for-linux-next (64989ca4b27a drm/i915: Refresh cached DP port register value on resume) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbc.c Merging drm-tegra/drm/tegra/for-next (575a892adaf7 gpu: host1x: Remove useless local variable) Merging drm-misc/topic/drm-misc (f510f34c12f6 drm/vc4: Remove unused connector) CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c 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 (2b669875332f drm/msm: Drop load/unload drm_driver ops) 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 (b7e7559f439c Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/dt-for-4.8' and 'sunxi/fixes-for-4.7' into sunxi/for-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/sun4i_drv.c Merging kbuild/for-next (7e01dad0469b Merge branch 'kbuild/kbuild' into kbuild/for-next) Applying: gcc-plugins: disable under COMPILE_TEST Merging kspp/for-next/kspp (20f0992c935f latent_entropy: Add the extra_latent_entropy kernel parameter) Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") Merging regmap/for-next (e568f95409ca Merge remote-tracking branches 'regmap/topic/i2c', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next) Merging sound/for-next (3915bf294652 ALSA: seq_timer: use monotonic times internally) Merging sound-asoc/for-next (ebed4462d4d6 Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next) Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled) Merging input/next (fcd6eb50eadd Input: add powerkey driver for HISI 65xx SoC) Merging block/for-next (3cee5575153a Merge branch 'for-4.8/core' into for-next) CONFLICT (content): Merge conflict in fs/f2fs/segment.c CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/compression.c CONFLICT (content): Merge conflict in block/blk-lib.c Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect) Merging device-mapper/for-next (0fe0a864be7f Merge branch 'dm-4.7' into for-next) Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) Merging mmc-uh/next (14c5283a54a5 mmc: sdhci: use pr_err for sdhci_dumpregs) Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.) CONFLICT (content): Merge conflict in drivers/md/raid10.c CONFLICT (content): Merge conflict in drivers/md/raid1.c Merging mfd/for-mfd-next (1cf9326d4c07 mfd: max14577: Allow driver to be built as a module) Merging backlight/for-backlight-next (4db8c9572ce1 backlight: lp855x: Add enable regulator) Merging battery/master (2e05b518c897 power_supply: bq27xxx_battery: Group register mappings into one table) Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module) Merging regulator/for-next (a435542da2d5 Merge remote-tracking branches 'regulator/topic/qcom-smd' and 'regulator/topic/twl' into regulator-next) Merging security/next (26703c636c1f um/ptrace: run seccomp after ptrace) Merging integrity/next (848b134bf8e7 ima: extend the measurement entry specific pcr) Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next) Merging selinux/next (309c5fad5de4 selinux: fix type mismatch) Merging tpmdd/next (3051e8c00764 tpm_crb: fix address space of the return pointer in crb_map_res()) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt Merging watchdog/master (1a695a905c18 Linux 4.7-rc1) Merging iommu/next (8d16cf6b773d Merge branches 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'arm/exynos' into next) Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) Merging vfio/next (9698cbf0bea6 vfio: platform: support No-IOMMU mode) Merging jc_docs/docs-next (072baa037110 Documentation: tiny typo fix in usb/gadget_multi.txt) Merging trivial/for-next (dcc381e8330e fat: fix typo s/supeblock/superblock/) Merging audit/next (bba696c2c083 s390: ensure that syscall arguments are properly masked on s390) CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c Merging devicetree/for-next (06dfeef88573 drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch) Merging mailbox/mailbox-for-next (9ef3c5112139 mailbox: mailbox-test: set tdev->signal to NULL after freeing) Merging spi/for-next (32b805cdb668 Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/rockchip', 'spi/topic/sh-msiof' and 'spi/topic/sunxi' into spi-next) Merging tip/auto-latest (f6e78bb49b4b Merge branch 'perf/core') Merging clockevents/clockevents/next (5a634113ad0e Merge branch 'clockevents/compile-test' into clockevents/next) CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig CONFLICT (content): Merge conflict in arch/arm/Kconfig Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) Merging edac-amd/for-next (bba142957e04 EDAC: Correct channel count limit) Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next) Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID) Merging rcu/rcu/next (2f939e1fc208 rcu: Use rcu_gp_kthread_wake() to wake up grace period kthreads again) CONFLICT (content): Merge conflict in kernel/rcu/tree.c Applying: rcu: merge fix for kernel/rcu/tree_exp.h Merging kvm/linux-next (8ff7b956471f Merge tag 'kvm-s390-next-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c Applying: s390: merge fix up for __diag204 move Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state) Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts) Merging kvms390/next (a411edf1320e KVM: s390: vsie: add module parameter "nested") Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration) 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 (ab9bb11ccbaa dell-wmi: Add a WMI event code for display on/off) Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") Merging hsi/for-next (ea12c45f1b36 hsi: Only descend into hsi directory when CONFIG_HSI is set) Merging leds/for-next (a8b8c8d67557 leds: Only descend into leds directory when CONFIG_NEW_LEDS is set) Merging ipmi/for-next (4e80ad011c9c ipmi: Remove smi_msg from waiting_rcv_msgs list before handle_one_recv_msg()) Merging driver-core/driver-core-next (5edb56491d48 Linux 4.7-rc3) Merging tty/tty-next (33688abb2802 Linux 4.7-rc4) Merging usb/usb-next (aa5e94a2e133 Revert "usb: ohci-at91: Forcibly suspend ports while USB suspend") Merging usb-gadget/next (1d23d16a88e6 usb: gadget: pch_udc: reorder spin_[un]lock to avoid deadlock) Merging usb-serial/usb-next (33688abb2802 Linux 4.7-rc4) 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 (9936913e549b staging: lustre: quiet lockdep recursive lock warning) 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 (c0ff9019ee64 mei: drop wr_msg from the mei_dev structure) Merging extcon/extcon-next (a05f44c89ee1 extcon: Check for incorrect connection type in notifier register) Merging cgroup/for-next (1f22cd881c59 Merge branch 'for-4.7-fixes' into for-next) Merging scsi/for-next (09aa8c2f3963 Merge branch 'misc' into for-next) Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race) Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) Merging libata/for-next (da780c64d2b6 Merge branch 'for-4.7-fixes' into for-next) Merging pinctrl/for-next (69fc8ca00b5d Merge branch 'devel' into for-next) 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 (ef583d362047 Merge branch 'rproc-next' into for-next) Merging gpio/for-next (c35285cb1570 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) Merging pwm/for-next (8910a6a600ee pwm: lpss: pci: Enable PWM module on Intel Edison) 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) Merging userns/for-next (cc50a07a247e userns: Remove the now unnecessary FS_USERNS_DEV_MOUNT flag) CONFLICT (content): Merge conflict in fs/proc/root.c Applying: proc: fixup for "prevent stacking filesystems on top" Merging ktest/for-next (2dcd0af568b0 Linux 4.6) Merging clk/clk-next (367b30502d07 Merge remote-tracking branch 'clk/clk-s905' into clk-next) Merging aio/master (b562e44f507e Linux 4.5) Merging kselftest/next (1a695a905c18 Linux 4.7-rc1) Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times) Merging luto-misc/next (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section) 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 (7c8cd269d93e coresight: Add better messages for coresight_timeout) Merging rtc/rtc-next (c361db5c2c64 x86: include linux/ratelimit.h in nmi.c) Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next) Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) Applying: crypto: make ecdh_shared_secret unique Merging akpm-current/current (e554dba4bab5 ipc/msg.c: use freezable blocking call) CONFLICT (content): Merge conflict in mm/page_alloc.c CONFLICT (content): Merge conflict in ipc/sem.c CONFLICT (content): Merge conflict in arch/arm64/mm/dma-mapping.c 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 Merging akpm/master (ac3cc41e0698 include/linux/bitmap.h: cleanup) -- 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
