Hi all, Changes since 20170424:
The net-next tree gained a conflict against the kbuild tree. The tip tree lost its build failure and gained a conflict against the powerpc tree. The scsi-mkp tree gained a conflict against the block tree. The nvdimm tree lost its build failure. Non-merge commits (relative to Linus' tree): 11536 10670 files changed, 1193532 insertions(+), 219524 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 and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 258 trees (counting Linus' and 37 trees of bug fix patches pending for the current merge release). 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 (ea839b41744d Merge tag 'arc-4.11-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc) Merging fixes/master (97da3854c526 Linux 4.11-rc3) Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition) Merging arc-current/for-curr (3d5e80125a6e ARCv2: entry: save Accumulator register pair (r58:59) if present) Merging arm-current/fixes (3872fe83a2fb Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes) Merging m68k-current/for-linus (e3b1ebd67387 m68k: Wire up statx) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y) Merging sparc/master (f6ebf0bb1a98 sparc: Update syscall tables.) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (fd2c83b35752 net/packet: check length in getsockopt() called with PACKET_HDRLEN) Merging ipsec/master (096f41d3a8fc af_key: Fix sadb_x_ipsecrequest parsing) Merging netfilter/master (1debdc8f9ebd sh_eth: unmap DMA buffers when freeing rings) Merging ipvs/master (8f8688b0d483 ipvs: explicitly forbid ipv6 service/dest creation if ipv6 mod is disabled) Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface) Merging mac80211/master (2f3bb64247b5 ipv6: sr: fix out-of-bounds access in SRH validation) Merging sound-current/for-linus (d4a2fbcee0c8 Merge tag 'asoc-fix-v4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging pci-current/for-linus (b9c1153f7a9c PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam)) Merging driver-core.current/driver-core-linus (39da7c509acf Linux 4.11-rc6) Merging tty.current/tty-linus (4f7d029b9bf0 Linux 4.11-rc7) Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5) Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held) Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON) Merging staging.current/staging-linus (39da7c509acf Linux 4.11-rc6) Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4) Merging input-current/for-linus (7c5bb4ac2b76 Input: i8042 - add Clevo P650RS to the i8042 reset list) Merging crypto-current/master (e6534aebb26e crypto: algif_aead - Fix bogus request dereference in completion function) Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info) Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6) Merging kselftest-fixes/fixes (c1ae3cfa0e89 Linux 4.11-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 (b2376407f989 mfd: cros-ec: Fix host command buffer size) Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats) Merging drm-intel-fixes/for-linux-next-fixes (5a7ad1146caa Linux 4.11-rc8) Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline) Merging kbuild/for-next (03133d4beac0 Merge branch 'kbuild' into for-next) CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) CONFLICT (content): Merge conflict in include/asm-generic/percpu.h Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7) Merging arm/for-next (71899360f430 Merge branches 'fixes' and 'misc' into for-next) Merging arm-perf/for-next/perf (f00fa5f4163b arm64: pmuv3: use arm_pmu ACPI framework) Merging arm-soc/for-next (6f714927c553 ARM: SoC: Document merges) CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) Merging amlogic/for-next (715dcd206041 Merge branch 'v4.12/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next) Merging at91/at91-next (ce60fdaa7e9e Merge remote-tracking branch 'alex_korg/at91-dt' into at91-next) Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-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 (990df0480610 Merge branch 'zte/dt64' into for-next) Merging keystone/next (4495c08e8472 Linux 4.11-rc2) Merging mvebu/for-next (4242642c21aa Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (5a0bbcf7ab0f Merge branch 'omap-for-v4.12/defconfig' into for-next) Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12) Merging renesas/next (410c0b62ddfa Merge branches 'arm64-dt-for-v4.12', 'dt-for-v4.12' and 'sysc-for-v4.12' into next) Merging rockchip/for-next (b1e842489772 Merge branch 'v4.12-armsoc/dts64' into for-next) Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) Merging samsung/for-next (1001354ca341 Linux 4.9-rc1) Merging samsung-krzk/for-next (f4fcaa6cec04 Merge branch 'next/dt64' into for-next) Merging sunxi/sunxi/for-next (5675caea945d Merge branches 'sunxi/clk-for-4.12', 'sunxi/dt-for-4.12' and 'sunxi/fixes-for-4.11' into sunxi/for-next) Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next) Merging arm64/for-next/core (faa9a08397f5 arm64: pmuv3: handle pmuv3+) Merging clk/clk-next (ee7d74339df7 clk: mvebu: Use kcalloc() in two functions) Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) 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 (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions) Merging m68knommu/for-next (99a2c395541f m68k/coldfire/pit: set ->min_delta_ticks and ->max_delta_ticks) Merging metag/for-next (d3ba2e922d4d metag/usercopy: Add 64-bit get_user support) Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families) Merging mips/mips-for-linux-next (d9c94cdf3bb5 Merge branch '4.11-fixes' into mips-for-linux-next) Merging nios2/for-next (d8f347ba35cf nios2: enable earlycon support) Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start) Merging parisc-hd/for-next (4f7d029b9bf0 Linux 4.11-rc7) Merging powerpc/next (9765ad134a00 powerpc/mm: Ensure IRQs are off in switch_mm()) Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx) Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) Merging s390/features (9b11c7912d00 s390/mm: simplify arch_get_unmapped_area[_topdown]) CONFLICT (content): Merge conflict in arch/s390/include/uapi/asm/Kbuild Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux) Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory) Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements) Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) Merging xtensa/xtensa-for-next (d0c32cdc395c Merge branch 'xtensa-dma-map-fix' into xtensa-for-next) Merging fscrypt/master (94840e3c802d fscrypt: eliminate ->prepare_context() operation) Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache) Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) Merging btrfs-kdave/for-next (953a8bf6cedd Merge branch 'for-next-next-v4.12-20170425' into for-next-20170425) Merging ceph/master (8179a101eb5f ceph: fix recursion between ceph_set_acl() and __ceph_setattr()) Merging cifs/for-next (f61143c45077 Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link) Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) Merging ext3/for_next (07f7e3135e58 Merge branch 'fsnotify' into for_next) Merging ext4/dev (d67d64f42314 ext4: fix two spelling nits) Merging f2fs/dev (d29fd1721851 f2fs: fix not to set fsync/dentry mark) Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces) Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size) Merging nfs/linux-next (35a244218901 Merge tag 'nfs-rdma-4.12-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma) Merging nfsd/nfsd-next (c02ea6a0583a svcrdma: Clean out old XDR encoders) Merging orangefs/for-next (96c641bc68a3 orangefs: move features validation to fix filesystem hang) Merging overlayfs/overlayfs-next (b0990fbbbd14 ovl: check IS_APPEND() on real upper inode) Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) Merging ubifs/linux-next (32fe905c17f0 ubifs: Fix O_TMPFILE corner case in ubifs_link()) Merging xfs/for-next (c4cf1acdb186 xfs: better log intent item refcount checking) Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) Merging vfs/for-next (2bb81bf9e14d Merge branch 'work.sane_pwd' into for-next) CONFLICT (content): Merge conflict in arch/sparc/Kconfig CONFLICT (content): Merge conflict in arch/s390/Kconfig CONFLICT (content): Merge conflict in arch/mips/Kconfig Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging printk/for-next (cf39bf58afda printk: fix double printing with earlycon) Merging pci/next (5b197c00850e Merge branch 'pci/remove' into next) CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild Merging pstore/for-next/pstore (eec50d76a6ee pstore: Drop needless inode lock during population) Merging hid/for-next (b9ae71373285 Merge branch 'for-4.11/upstream-fixes' into for-next) Merging i2c/i2c/for-next (f49ee0593cde Merge branch 'i2c/for-4.12' 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 (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first) Merging hwmon-staging/hwmon-next (39c382a31094 hwmon: (tmp103) Use SIMPLE_DEV_PM_OPS helper macro) Merging jc_docs/docs-next (6e91b74d56e1 Documentation: allow installing man pages to a user defined directory) Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails) Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next) Merging fbdev/fbdev-for-next (3bbb5b823416 video: console: Remove reference to CONFIG_8xx) Merging pm/linux-next (6fdf90d2069d Merge branches 'acpi-power', 'acpi-blacklist', 'acpi-video' and 'acpi-doc' into linux-next) Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) Merging thermal/next (f7b553c688c3 Merge branches 'for-rc' and 'thermal-core' into next) Merging thermal-soc/next (19fd1783c24e Merge branch 'work-linus' into work-next) CONFLICT (content): Merge conflict in drivers/thermal/Makefile CONFLICT (content): Merge conflict in drivers/thermal/Kconfig Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure) Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) Merging net-next/master (7acedaf5c435 net: move xdp_prog field in RX cache lines) CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/pci.h CONFLICT (content): Merge conflict in drivers/pci/msi.c Merging ipsec-next/master (e892d2d40445 esp: Fix misplaced spin_unlock_bh.) Merging netfilter-next/master (122868b37809 netfilter: tcp: Use TCP_MAX_WSCALE instead of literal 14) Merging ipvs-next/master (e81beb79da5b ipvs: change comparison on sync_refresh_period) Merging wireless-drivers-next/master (a0597834dc0e rt2800: fix mt7620 E2 channel registers) Merging bluetooth/master (0a44e632c3ce Bluetooth: Fix user channel for 32bit userspace on 64bit kernel) Merging mac80211-next/master (127f60bfa98f mac80211: rewrite monitor mode delivery logic) Merging rdma/for-next (cc47dd684ee0 IB/vmw_pvrdma: Spare annotate imm_data) Merging gfs2/for-next (d552a2b9b33e GFS2: Non-recursive delete) Merging mtd/master (c1ae3cfa0e89 Linux 4.11-rc1) Merging l2-mtd/master (da4b1caa49cb mtd: physmap_of: use OF helpers for reading strings) Merging nand/nand/next (9d2ee0a60b8b mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program) Merging spi-nor/next (cc34efbfb797 mtd: spi-nor: introduce Octo SPI protocols) Merging crypto/master (2a2a251f1105 crypto: algif_aead - Require setkey before accept(2)) CONFLICT (content): Merge conflict in include/linux/crypto.h CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32746g-eval.dts Applying: crypto: merge fix for CRYPTO_MAX_ALG_NAME move Merging drm/drm-next (6b1462700b4a Merge tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_hdmi.c Applying: tee: merge fix for dma-ops field name changes Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (ab6eb211b07a Merge tag 'drm/panel/for-4.12-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next) Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown) CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/drm.c Merging drm-misc/for-linux-next (f9b67f0014cb dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro) 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 (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree) Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address) Merging mali-dp/for-upstream/mali-dp (c2e7f82d336a drm: mali-dp: Check the mclk rate and allow up/down scaling) Merging sunxi-drm/sunxi-drm/for-next (2da042ac05e9 MAINTAINERS: Add sun4i-drm git repo) Merging imx-drm/imx-drm/next (3d1df96ad468 drm/imx: merge imx-drm-core and ipuv3-crtc in one module) Merging etnaviv/etnaviv/next (78ec187f64fa drm/etnaviv: submit support for out-fences) Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp) Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next) Merging sound/for-next (610793fe2b1c Merge branch 'topic/hda-dual-codecs' into for-next) Merging sound-asoc/for-next (f7190f9f96e7 Merge remote-tracking branches 'asoc/topic/wm8903', 'asoc/topic/wm8960', 'asoc/topic/wm8978' and 'asoc/topic/zte-tdm' into asoc-next) Merging modules/modules-next (175861882769 kallsyms: Use bounded strnchr() when parsing string) Merging input/next (aea415b1d10e Input: add uinput documentation) CONFLICT (content): Merge conflict in Documentation/input/ff.rst Merging block/for-next (a2db02ec349f Merge branch 'for-4.12/block' into for-next) Applying: nbd: fix up for nla_parse_nested() API change Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (ccf0a6821d28 Merge branch 'dm-4.12' into dm-4.12-merge-with-block) Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) Merging mmc/next (ff4143ccff31 MIPS: Octeon: cavium_octeon_defconfig: Enable Octeon MMC) Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) Merging md/for-next (296617581eac md/raid1/10: remove unused queue) CONFLICT (content): Merge conflict in drivers/md/raid5.h CONFLICT (content): Merge conflict in drivers/md/raid5.c CONFLICT (content): Merge conflict in drivers/md/raid0.c CONFLICT (content): Merge conflict in drivers/md/md.h CONFLICT (content): Merge conflict in drivers/md/linear.c Merging mfd/for-mfd-next (a676b983ba81 dt-bindings: Add AXP803's regulator info) Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips) Merging battery/for-next (6c381663bb3b power: supply: bq24190_charger: Use new extcon_register_notifier_all()) Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) Merging regulator/for-next (f123e7b2a6e3 Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next) Merging security/next (8979b02aaf1d tpm: Fix reference count to main device) Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.) Merging keys/keys-next (4cd4ca7cc848 keys: select CONFIG_CRYPTO when selecting DH / KDF) Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug) Merging tpmdd/next (8979b02aaf1d tpm: Fix reference count to main device) Merging watchdog/master (0a7472cbf212 Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging) Merging iommu/next (efc2195bcc35 Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote()) Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) Merging audit/next (4acdad9bab28 audit: use kmem_cache to manage the audit_buffer cache) Merging devicetree/for-next (b8475cbee5ab of: fix "/cpus" reference leak in of_numa_parse_cpu_nodes()) Merging mailbox/mailbox-for-next (73874913d504 mailbox: Remove depends on COMPILE_TEST for BCM_FLEXRM_MBOX) Merging spi/for-next (cec00ac5dad3 Merge remote-tracking branch 'spi/topic/xlp' into spi-next) Merging tip/auto-latest (8a86a1ec6609 Merge branch 'x86/vdso') CONFLICT (content): Merge conflict in kernel/kprobes.c CONFLICT (content): Merge conflict in drivers/firmware/efi/efi-pstore.c CONFLICT (content): Merge conflict in arch/arm64/include/asm/bug.h CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188.dtsi Applying: drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU" Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12) Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) Merging edac-amd/for-next (bffc7dece92e EDAC: Rename report status accessors) Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) Merging ftrace/for-next (c486bbae781c Merge branch 'trace/ftrace/core' into trace/ftrace/next) Merging rcu/rcu/next (8a6ad489518e rcuperf: Set more user-friendly defaults) Merging kvm/linux-next (bd17117bb2af Merge tag 'kvm-s390-next-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) Merging kvm-arm/next (1edb632133ef ARM: KVM: Fix idmap stub entry when running Thumb-2 code) CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic.h CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic-v2.c CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (feafd13c96d6 KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs) Merging kvms390/next (730cd632c4e4 KVM: s390: Support keyless subset guest mode) Merging xen-tip/linux-next (7ecff7dc7ec5 xen/pvh: Do not fill kernel's e820 map in init_pvh_bootparams()) CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c Applying: x86/xen: merge fix up for arch/x86/xen/mmu.c code movement Applying: x86/xen: merge fix for arch/x86/xen/enlighten.c code movement Merging percpu/for-next (8a1df543de8a percpu: remove unused chunk_alloc parameter from pcpu_get_pages()) Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next) Merging drivers-x86/for-next (58688a7525b6 platform/x86: INT33FE: add i2c dependency) Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") Merging hsi/for-next (9b9aab2257ad MAINTAINERS: update file entry for HSI subsystem) Merging leds/for-next (28c5fe99016d leds: pca9532: Extend pca9532 device tree support) Merging ipmi/for-next (3f724c408a7b ipmi_si: use smi_num for init_name) Merging driver-core/driver-core-next (523aa3586ffb Merge 4.11-rc6 into driver-core-next) Merging usb/usb-next (19445816996d USB: Revert "cdc-wdm: fix "out-of-sync" due to missing notifications") CONFLICT (content): Merge conflict in Documentation/media/v4l-drivers/philips.rst Merging usb-gadget/next (48eab1f28d49 usb: gadget: udc: atmel: Update Kconfig help for fifo_mode = 0) Merging usb-serial/usb-next (31c5d1922b90 USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit) Merging usb-chipidea-next/ci-for-usb-next (a932a8041ff9 usb: chipidea: core: add sysfs group) Merging phy-next/next (6239879b415e phy: qcom-qusb2: add NVMEM dependency) Merging tty/tty-next (15a065485138 Merge 4.11-rc7 into tty-next) CONFLICT (content): Merge conflict in include/linux/serdev.h Merging char-misc/char-misc-next (049a59db34eb firmware: Google VPD sysfs driver) CONFLICT (content): Merge conflict in drivers/misc/Makefile CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c Applying: firmware: google memconsole: merge fix for e820.h move Merging extcon/extcon-next (70641a0a84e1 extcon: Use BIT() macro for the left-shift operation) Merging staging/staging-next (f06ee95ce6b0 staging: most: aim-sound style fixess) CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_sir.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_sir.c left in tree. CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_sasem.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_sasem.c left in tree. CONFLICT (content): Merge conflict in drivers/staging/media/Makefile CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig $ git rm -f drivers/staging/media/lirc/lirc_sasem.c drivers/staging/media/lirc/lirc_sir.c Applying: staging: merge fix for add/change_virtual-intf API change Merging mux/for-next (7816ffe4dcb6 mux: adg792a: add mux controller driver for ADG792A/G) CONFLICT (content): Merge conflict in drivers/i2c/muxes/Makefile CONFLICT (content): Merge conflict in drivers/i2c/muxes/Kconfig CONFLICT (content): Merge conflict in drivers/Makefile CONFLICT (content): Merge conflict in drivers/Kconfig Merging slave-dma/next (068c69a2b43f Merge branch 'for-linus' into next) Merging cgroup/for-next (8673d8769243 Merge branch 'for-4.11-fixes' into for-next) Merging scsi/for-next (f506b0386683 Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/osd/osd_uld.c Applying: scsi: osd_uld: fix mismerge Merging scsi-mkp/for-next (4da2b1eb230b scsi: mac_esp: Replace bogus memory barrier with spinlock) CONFLICT (content): Merge conflict in drivers/scsi/sd.c Merging target-updates/for-next (9f7ebfc64d2c tcm: make pi data verification configurable) Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) Merging target-bva/for-next (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors) Merging libata/for-next (b09754f570fa Merge branch 'for-4.11-fixes' into for-next) Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) Merging vhost/linux-next (d635daaa99c6 ptr_ring: batched ring producer) Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (fa2f60ffa0e0 gpio: DT bindings, move tca9554 from pcf857x to pca953x) CONFLICT (content): Merge conflict in drivers/input/misc/soc_button_array.c Merging pinctrl/for-next (02101cb3f5a2 pinctrl: tegra: xusb: Silence sparse warnings) Merging pinctrl-samsung/for-next (c8dd100397f3 Merge branch 'pinctrl-next' into for-next) Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/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 (6c478ae9204b signal: Make kill_proc_info static) Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block) Merging aio/master (b562e44f507e Linux 4.5) Merging kselftest/next (51c6bd7cbe03 selftests: gpio: fix clean target to remove all generated files and dirs) Merging y2038/y2038 (69973b830859 Linux 4.9) Merging luto-misc/next (2dcd0af568b0 Linux 4.6) Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging livepatching/for-next (608822c0f7af Merge branch 'for-4.12/upstream' into for-next) CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in include/linux/init_task.h CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h CONFLICT (content): Merge conflict in arch/s390/kernel/entry.S CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h Merging coresight/next (5a99899065da coresight: tmc: minor fix for output log) Merging rtc/rtc-next (5d05e81516cf rtc: sh: mark PM functions as unused) Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) Merging nvdimm/libnvdimm-for-next (51891c7db266 Merge branch 'for-4.12/dax' into libnvdimm-for-next) CONFLICT (content): Merge conflict in fs/dax.c CONFLICT (content): Merge conflict in drivers/block/brd.c Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) Merging akpm-current/current (02dff0ef2e7f sysv,ipc: cacheline align kern_ipc_perm) CONFLICT (content): Merge conflict in tools/testing/selftests/vm/run_vmtests CONFLICT (content): Merge conflict in mm/page_alloc.c CONFLICT (content): Merge conflict in fs/dax.c CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c Applying: linux-next-rejects $ git checkout -b akpm remotes/origin/akpm/master Applying: imx7: fix Kconfig warning and build errors Applying: sparc64: NG4 memset 32 bits overflow Applying: mm: zero hash tables in allocator Applying: mm: update callers to use HASH_ZERO flag Applying: mm: adaptive hash table scaling Applying: mm: introduce kv[mz]alloc helpers Applying: mm: introduce kv[mz]alloc helpers - f2fs fix up Applying: mm: support __GFP_REPEAT in kvmalloc_node for >32kB Applying: lib/rhashtable.c: simplify a strange allocation pattern Applying: net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern Applying: fs/xattr.c: zero out memory copied to userspace in getxattr Applying: treewide: use kv[mz]alloc* rather than opencoded variants Applying: net: use kvmalloc with __GFP_REPEAT rather than open coded variant Applying: drivers/md/dm-ioctl.c: use kvmalloc rather than opencoded variant Applying: drivers/md/bcache/super.c: use kvmalloc Applying: mm, swap: use kvzalloc to allocate some swap data structures Applying: mm, vmalloc: use __GFP_HIGHMEM implicitly Applying: scripts/spelling.txt: add "memory" pattern and fix typos Applying: scripts/spelling.txt: Add regsiter -> register spelling mistake Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances Applying: treewide: spelling: correct diffrent[iate] and banlance typos Applying: treewide: move set_memory_* functions away from cacheflush.h Applying: arm: use set_memory.h header Applying: arm64: use set_memory.h header Applying: s390: use set_memory.h header Applying: x86: use set_memory.h header Applying: agp: use set_memory.h header Applying: drm: use set_memory.h header Applying: drm-use-set_memoryh-header-fix Applying: drivers/hwtracing/intel_th/msu.c: use set_memory.h header Applying: drivers/watchdog/hpwdt.c: use set_memory.h header Applying: include/linux/filter.h: use set_memory.h header Applying: kernel/module.c: use set_memory.h header Applying: kernel/power/snapshot.c: use set_memory.h header Applying: alsa: use set_memory.h header Applying: drivers/misc/sram-exec.c: use set_memory.h header Applying: drivers/video/fbdev/vermilion/vermilion.c: use set_memory.h header Applying: drivers/staging/media/atomisp/pci/atomisp2: use set_memory.h Applying: treewide: decouple cacheflush.h and set_memory.h Applying: kprobes/x86: merge fix for set_memory.h decoupling Applying: kref: remove WARN_ON for NULL release functions Applying: drivers/scsi/megaraid: remove expensive inline from megasas_return_cmd Applying: include/linux/uaccess.h: remove expensive WARN_ON in pagefault_disabled_dec Applying: fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag Applying: Documentation/vm/transhuge.txt: fix trivial typos Applying: docs-vm-transhuge-fix-few-trivial-typos-fix Applying: format-security: move static strings to const Applying: fs: f2fs: use ktime_get_real_seconds for sit_info times Applying: trace: make trace_hwlat timestamp y2038 safe Applying: fs: cifs: replace CURRENT_TIME by other appropriate apis Applying: fs: ceph: CURRENT_TIME with ktime_get_real_ts() Applying: fs: ufs: use ktime_get_real_ts64() for birthtime Applying: fs: ubifs: replace CURRENT_TIME_SEC with current_time Applying: lustre: replace CURRENT_TIME macro Applying: apparmorfs: replace CURRENT_TIME with current_time() Applying: gfs2: replace CURRENT_TIME with current_time Applying: time: delete CURRENT_TIME_SEC and CURRENT_TIME Applying: time: delete current_fs_time() Applying: mm/huge_memory.c.c: use zap_deposited_table() more Applying: mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required Applying: mm: prevent potential recursive reclaim due to clearing PF_MEMALLOC Applying: mm: introduce memalloc_noreclaim_{save,restore} Applying: treewide: convert PF_MEMALLOC manipulations to new helpers Applying: treewide-convert-pf_memalloc-manipulations-to-new-helpers-fix Applying: mtd: nand: nandsim: convert to memalloc_noreclaim_*() Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant Merging akpm/master (b7796f38de8a lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
