Hi all, Please do *not* add any v4.10 material to your linux-next included trees until v4.9-rc1 has been released i.e. the merge window closes. Changes since 20161010: Non-merge commits (relative to Linus' tree): 3095 3410 files changed, 169222 insertions(+), 98883 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 243 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 (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured) Merging arc-current/for-curr (8df0cc75f530 ARC: [build] Support gz, lzma compressed uImage) Merging arm-current/fixes (fb833b1fbb68 ARM: fix delays) Merging m68k-current/for-linus (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (b79331a5eb9f powerpc/powernv/pci: Fix m64 checks for SR-IOV and window alignment) Merging sparc/master (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging net/master (d24cd733bae8 Merge branch 'be2net-fixes') Merging ipsec/master (b1f2beb87bb0 Merge tag 'media/v4.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) Merging netfilter/master (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes') Merging wireless-drivers/master (29d5e6fbd65b rtl8xxxu: Fix rtl8192eu driver reload issue) Merging mac80211/master (7aa6ec229661 drivers: net: phy: Correct duplicate MDIO_XGENE entry) Merging sound-current/for-linus (b907900ec406 ALSA: line6: Fix POD X3 Live audio input) Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal) Merging driver-core.current/driver-core-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) Merging tty.current/tty-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) Merging usb.current/usb-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) Merging usb-gadget-fixes/fixes (d8a4100ddc75 usb: gadget: udc: atmel: fix endpoint name) Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader) Merging usb-chipidea-fixes/ci-for-usb-stable (6b7f456e67a1 usb: chipidea: host: fix NULL ptr dereference during shutdown) Merging staging.current/staging-linus (24532f768121 Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block) Merging char-misc.current/char-misc-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) Merging input-current/for-linus (c758f96a8c34 Merge branch 'next' into for-linus) Merging crypto-current/master (c3afafa47898 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling) Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1) 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 (c8d2bc9bc39e Linux 4.8) Merging kbuild/for-next (b12a295d66bb Merge branch 'kbuild/misc' into kbuild/for-next) CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in kbuild/for-next and modified in HEAD. Version HEAD of arch/x86/kernel/x8664_ksyms_64.c left in tree. CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_64.S CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_32.S CONFLICT (content): Merge conflict in arch/Kconfig $ git rm -f arch/x86/kernel/x8664_ksyms_64.c Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) Merging arc/for-next (8df0cc75f530 ARC: [build] Support gz, lzma compressed uImage) Merging arm/for-next (70fe0fd28524 Merge branch 'fixes' into for-next) Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2) Merging arm-soc/for-next (bcaf9dcf55fd ARM: SoC: Document merges) Merging pinctrl/for-next (6d475e0b3980 pinctrl: baytrail: Fix lockdep) Merging amlogic/for-next (8148ca0d95ec Merge branch 'v4.8/dt64-2' 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 (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next) Merging berlin/berlin/for-next (5153351425c9 Merge branch '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 (70da51e698c7 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next) Merging mvebu/for-next (a9c51ff3121f Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next) Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8) Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next) Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' 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 (ea24fc2674ef Merge branch 'next/dt' into for-next) Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next) Merging arm64/for-next/core (db68f3e7594a arm64: tlbflush.h: add __tlbi() macro) 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 (2dc024e94578 cris: return of class_create should be considered) 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 (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) Merging m68k/for-next (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h) Merging m68knommu/for-next (742859adc721 m68k: let clk_disable() return immediately if clk is NULL) Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1) Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) Merging mips/mips-for-linux-next (3f5f0a4475e1 MIPS: generic: Convert SEAD-3 to a generic board) Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool) Merging parisc-hd/for-next (f79b076eb3a8 parisc: Move exception table into read-only section) Merging powerpc/next (b7b7013cac55 powerpc/bpf: Add support for bpf constant blinding) Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig) Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) Merging s390/features (67bfcfe52529 s390/dasd: avoid undefined behaviour) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h) Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section) Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface) Merging xtensa/xtensa-for-next (a4c6be5ad1d0 xtensa: disable MMU initialization option on MMUv2 cores) Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c) Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) Merging btrfs-kdave/for-next (819d18cf0d4a Merge branch 'for-next-next-4.9-20160927' into for-next-20160927) Merging ceph/master (64f77566e1c8 crush: remove redundant local variable) Merging cifs/for-next (08e36afdd53c Expose cifs module parameters in sysfs) Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.) Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) Merging ext3/for_next (6ed47823005f isofs: Do not return EACCES for unknown filesystems) Merging ext4/dev (18017479caba ext4: remove unused variable) Merging f2fs/dev (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) Merging fuse/for-next (63401ccdb2ca fuse: limit xattr returned size) Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security) Merging jfs/jfs-next (240c5185c52d jfs: Simplify code) Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6) Merging nfsd/nfsd-next (29ae7f9dc21a NFSD: Implement the COPY call) Merging orangefs/for-next (f60fbdbf41c8 Revert "orangefs: bump minimum userspace version") Merging overlayfs/overlayfs-next (b6495a35e189 ovl: use vfs_get_link()) Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) Merging ubifs/linux-next (ec037dfcc064 UBIFS: improve function-level documentation) Merging xfs/for-next (6f97077ff6ef xfs: rework refcount cow recovery error handling) Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns) Merging vfs/for-next (8dfae94cf9fb Merge branches 'work.uaccess', 'work.uaccess2' and 'work.xattr' into for-next) CONFLICT (content): Merge conflict in fs/ubifs/dir.c CONFLICT (content): Merge conflict in fs/overlayfs/super.c CONFLICT (content): Merge conflict in fs/fuse/dir.c CONFLICT (content): Merge conflict in arch/x86/mm/fault.c Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8) Merging pci/next (bdf530984d10 Merge branch 'pci/host-vmd' into next) Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking) Merging hid/for-next (419c103f0833 Merge branch 'for-4.9/upstream' into for-next) Merging i2c/i2c/for-next (7cbca2b38734 Merge branch 'i2c/for-4.9' into i2c/for-next) Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging dmi/master (c8d2bc9bc39e Linux 4.8) Merging hwmon-staging/hwmon-next (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources) Merging jc_docs/docs-next (02e69d5b97f0 Merge branch 'doc/4.9' into docs-next) CONFLICT (content): Merge conflict in Documentation/sphinx-static/theme_overrides.css Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next) CONFLICT (content): Merge conflict in MAINTAINERS Merging pm/linux-next (02007c607fc8 Merge branch 'acpi-misc' into linux-next) Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) Merging thermal/next (43720df96023 thermal: int3403: Process trip change notification) Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5) Merging ieee1394/for-next (6449e31ddebd firewire: nosy: do not ignore errors in ioremap_nocache()) 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 net-next/master (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper) Merging netfilter-next/master (2fa46c130193 netfilter: nft_limit: fix divided by zero panic) Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL) Merging wireless-drivers-next/master (15b95a159502 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging bluetooth/master (2326243d6b25 Bluetooth: hci_bcm: Fix autosuspend PM for Lenovo ThinkPad 8) CONFLICT (content): Merge conflict in net/bluetooth/hci_request.c Merging mac80211-next/master (3477d168ba61 Merge tag 'backlight-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight) Merging rdma/for-next (2937f3757519 staging/lustre: Disable InfiniBand support) Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5) Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5) Merging mtd/master (69db4aa44fdd Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux) Merging l2-mtd/master (69db4aa44fdd Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux) Merging nand/nand/next (d44154f969a4 mtd: nand: Provide nand_cleanup() function to free NAND related resources) Merging crypto/master (f97581cfa6e7 crypto: caam - treat SGT address pointer as u64) Merging drm/drm-next (b89857852656 Merge branch 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux into drm-next) CONFLICT (content): Merge conflict in Documentation/gpu/index.rst Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel) Merging drm-intel/for-linux-next (105f1a65b04a drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next) Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption) Merging drm-misc/topic/drm-misc (a5bd451b6e6e drm/crtc: constify drm_crtc_index parameter) Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing) Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7) Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver) Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next) Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy) Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") Merging regmap/for-next (96d87581df93 Merge tag 'regmap-v4.9' into regmap-linus) Merging sound/for-next (b907900ec406 ALSA: line6: Fix POD X3 Live audio input) Merging sound-asoc/for-next (14a08e0b6de3 Merge remote-tracking branch 'asoc/fix/tas571x' into asoc-linus) Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit) Merging input/next (ff43f433e011 Input: melfas_mip4 - add maintainer information) Merging block/for-next (25d09398f1c4 Merge branch 'for-4.9/block' into for-next) Merging lightnvm/for-next (1a6fe74dfd1b nvme: Pass pointers, not dma addresses, to nvme_get/set_features()) Merging device-mapper/for-next (8ff232c1a819 dm mpath: always return reservation conflict without failing over) Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) Merging mmc-uh/next (fee686b74a9c mmc: sdhci-pci: Fix bus power failing to enable for some Intel controllers) Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) Merging md/for-next (5a5a36351abe lib/raid6: Add AVX2 optimized xor_syndrome functions) Merging mfd/for-mfd-next (b8d336ed90f5 mfd: arizona: Handle probe deferral for reset GPIO) Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep) Merging battery/for-next (1d72706f0485 power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update) Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) Merging regulator/for-next (80f473833aba Merge tag 'regulator-v4.9' into regulator-linus) Merging security/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next) Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook) Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next) Merging selinux/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next) Merging tpmdd/next (213ebc81ac3f tmp/tpm_crb: implement runtime pm for tpm_crb) Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support) Merging iommu/next (13a08259187c Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next) Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) Merging vfio/next (61771468e0a5 vfio_pci: use pci_alloc_irq_vectors) Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message) Merging audit/next (7ff89ac608d9 audit: add exclude filter extension to feature bitmap) Merging devicetree/for-next (87e5fc99b028 DT: irqchip: renesas-irqc: document R8A7743/5 support) Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings) Merging spi/for-next (ed34b9560902 Merge tag 'spi-v4.9' into spi-linus) Merging tip/auto-latest (1e1a4b0f5412 Merge branch 'perf/urgent') 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 (a29d64a45eed EDAC, altera: Add IRQ Flags to disable IRQ while handling) Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next) Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well) Merging rcu/rcu/next (571c1979fe2b torture: Prevent jitter from delaying build-only runs) Merging kvm/linux-next (6218590bcb45 Merge tag 'kvm-4.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm) Merging kvm-arm/next (0099b7701f52 KVM: arm/arm64: vgic: Don't flush/sync without a working vgic) Merging kvm-mips/next (bf18db4e7bd9 KVM: MIPS: Drop dubious EntryHi optimisation) Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) Merging kvm-ppc-paulus/kvm-ppc-next (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register) Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next) Merging xen-tip/linux-next (a6a198bc60e6 xen/x86: Update topology map for PV VCPUs) Merging percpu/for-next (9b7396624a7b mm/percpu.c: fix potential memory leakage for pcpu_embed_first_chunk()) CONFLICT (content): Merge conflict in include/asm-generic/percpu.h Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up()) Merging drivers-x86/for-next (b5643539b825 platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A) Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) Merging leds/for-next (6f3bad967072 leds: triggers: Check return value of kobject_uevent_env()) Merging ipmi/for-next (bd85f4b37ddf ipmi: fix crash on reading version from proc after unregisted bmc) Merging driver-core/driver-core-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) Merging tty/tty-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) Merging usb/usb-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency) Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables) Merging usb-chipidea-next/ci-for-usb-next (c6900310b6cc usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY) Merging staging/staging-next (24532f768121 Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block) Merging char-misc/char-misc-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew)) Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware) Merging slave-dma/next (8df33b00f57d Merge branch 'for-linus' into next) Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next) Merging scsi/for-next (51ff5072f431 Merge branch 'misc' into for-next) Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation") Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) Merging libata/for-next (df073d9e6a7d Merge branch 'for-4.9' into for-next) Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices) Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c Merging rpmsg/for-next (2fdd6c32d6a5 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (a5ea9f982d2b gpio: mxs: Unmap region obtained by of_iomap) Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next) 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 (069d5ac9ae0d autofs: Fix automounts by using current_real_cred()->uid) Merging ktest/for-next (2dcd0af568b0 Linux 4.6) Merging clk/clk-next (b4626a7f4892 CLK: Add Loongson1C clock support) Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes) Merging aio/master (b562e44f507e Linux 4.5) Merging kselftest/next (f59c668c0b89 Doc: update 00-INDEX files to reflect the runnable code move) Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID) CONFLICT (content): Merge conflict in fs/afs/main.c Merging luto-misc/next (2dcd0af568b0 Linux 4.6) Merging borntraeger/linux-next (b562e44f507e Linux 4.5) Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific) Merging coresight/next (27dbe886867a coresight: etm3x: Adding missing features of Coresight PTM components) Merging rtc/rtc-next (00f7f90c51df rtc: cmos: avoid unused function warning) Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) Merging nvdimm/libnvdimm-for-next (e476f94482fc Merge branch 'for-4.9/dax' into libnvdimm-for-next) Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) Merging akpm-current/current (b1c8025d8e14 ipc/sem.c: Add cond_resched in exit_sme) CONFLICT (content): Merge conflict in mm/percpu.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s Applying: kdump, vmcoreinfo: report memory sections virtual addresses Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping Applying: scripts/tags.sh: enable code completion in VIM Applying: kthread: rename probe_kthread_data() to kthread_probe_data() Applying: kthread: kthread worker API cleanup Applying: crypto: engine: fix linux-next merge conflict Applying: kthread/smpboot: do not park in kthread_create_on_cpu() Applying: kthread: allow to call __kthread_create_on_node() with va_list args Applying: kthread: add kthread_create_worker*() Applying: kthread: add kthread_destroy_worker() Applying: kthread: detect when a kthread work is used by more workers Applying: kthread: initial support for delayed kthread work Applying: kthread: allow to cancel kthread work Applying: kthread: allow to modify delayed kthread work Applying: kthread: better support freezable kthread workers Applying: kthread: add kerneldoc for kthread_create() Applying: hung_task: allow hung_task_panic when hung_task_warnings is 0 Applying: hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix Applying: treewide: remove redundant #include <linux/kconfig.h> Applying: fs: use mapping_set_error instead of opencoded set_bit Applying: fs-use-mapping_set_error-instead-of-opencoded-set_bit-fix Applying: mm: split gfp_mask and mapping flags into separate fields Merging akpm/master (99693352bd3f mm: split gfp_mask and mapping flags into separate fields) -- 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
