Hi all, Changes since 20170530: The mfd tree gained a build failure so I used the version from next-20170530. The drivers-x86 tree gained the same build failure as the mfd tree so I used the version from next-20170530. The rtc tree gained a build failure so I used the version from next-20170530. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 3325 3598 files changed, 135000 insertions(+), 72065 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 263 trees (counting Linus' and 40 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 (f511c0b17b08 "Yes, people use FOLL_FORCE ;)") Merging fixes/master (97da3854c526 Linux 4.11-rc3) Merging kbuild-current/fixes (05d8cba4a1e8 kbuild: skip install/check of headers right under uapi directories) Merging arc-current/for-curr (a4da5b17736d arc: Set IO-coherency aperture base to LINUX_LINK_BASE) Merging arm-current/fixes (2ea659a9ef48 Linux 4.12-rc1) Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (a4700a261072 powerpc: Add PPC_FEATURE userspace bits for SCV and DARN instructions) Merging sparc/master (7485af89a6fd arch/sparc: increase CONFIG_NODES_SHIFT on SPARC64 to 5) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (b9565077ae6c Merge branch 'mlx4-mlx5-MAINTAINERS-update') Merging ipsec/master (a486cd23661c xfrm: fix state migration copy replay sequence numbers) Merging netfilter/master (468b0df61a51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) Merging wireless-drivers/master (6d18c732b95c bridge: start hello_timer when enabling KERNEL_STP in br_stp_start) Merging mac80211/master (7a7c0a6438b8 mac80211: fix TX aggregation start/stop callback race) Merging sound-current/for-linus (1fc2e41f7af4 ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430) Merging pci-current/for-linus (bd2df9b1e094 PCI: Make error code types consistent in pci_{read,write}_config_*) Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2) Merging tty.current/tty-linus (5ed02dbb4974 Linux 4.12-rc3) Merging usb.current/usb-linus (b3addcf0d1f0 usb: musb: dsps: keep VBUS on for host-only mode) Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11) Merging usb-serial-fixes/usb-linus (5ed02dbb4974 Linux 4.12-rc3) Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) Merging phy/fixes (a380b78b799b phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer) Merging staging.current/staging-linus (3d51b9562673 staging: ccree: add CRYPTO dependency) Merging char-misc.current/char-misc-linus (cdc1daca1b9b MAINTAINERS: Change maintainer of genwqe driver) Merging input-current/for-linus (2fef826e45c6 Input: synaptics - tell users to report when they should be using rmi-smbus) Merging crypto-current/master (f3ad587070d6 crypto: gcm - wait for crypto op not signal safe) Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination) Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6) Merging kselftest-fixes/fixes (2ea659a9ef48 Linux 4.12-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 nand-fixes/nand/fixes (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static) Merging spi-nor-fixes/spi-nor/fixes (2ea659a9ef48 Linux 4.12-rc1) Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size) Merging v4l-dvb-fixes/fixes (dd8245f445f5 [media] atomisp: don't treat warnings as errors) Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded) Merging drm-intel-fixes/for-linux-next-fixes (9bd9590997b9 drm/i915: Stop pretending to mask/unmask LPE audio interrupts) Merging drm-misc-fixes/for-linux-next-fixes (82bc9a42cf85 drm/gma500/psb: Actually use VBT mode when it is found) Merging kbuild/for-next (547b9255cde5 Merge branch 'fixes' into for-next) 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 (e89c0dc7736d Merge branches 'fixes' (early part) and 'misc' into for-next) Merging arm-perf/for-next/perf (2ea659a9ef48 Linux 4.12-rc1) Merging arm-soc/for-next (a8854d66fe2c arm-soc: document merges) Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) Merging amlogic/for-next (15e858ec0c62 Merge branch 'v4.13/defconfig' 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 (7d9fb74454a7 Merge branch 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) Merging bcm2835/for-next (c156bb73ae01 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 (428c917deaaf Merge branch 'imx/defconfig' into for-next) Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next) Merging mvebu/for-next (e629b4b1c763 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (25672c8bb173 Merge branch 'omap-for-v4.13/dt' into for-next) Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) Merging reset/reset/next (2acb037fc42b reset: Add a Gemini reset controller) Merging qcom/for-next (bca31d5e9dcb Merge branch 'arm64-for-4.13' into all-for-4.13) Merging realtek/realtek/for-next (af5f7bdb3c04 Merge branch 'realtek/v4.12/dt64' into next) Merging renesas/next (bfcadd8730e0 Merge branches 'arm64-dt-for-v4.13' and 'dt-for-v4.13' into next) Merging rockchip/for-next (7de9be9b8bfa Merge branch 'v4.13-armsoc/dts64' into for-next) Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1) Merging samsung-krzk/for-next (64eaeaf32bc5 Merge branch 'next/defconfig' into for-next) Merging sunxi/sunxi/for-next (fa13b83964f0 Merge branches 'sunxi/dt-for-4.13' and 'sunxi/clk-for-4.13' into sunxi/for-next) Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next) Merging arm64/for-next/core (db46a72b9713 ARM64/PCI: Set root bus NUMA node on ACPI systems) Merging clk/clk-next (658a7568030e Merge tag 'meson-clk-fixes-for-4.12-rc2' of git://github.com/baylibre/clk-meson into clk-fixes) 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 (1072734a2c63 m68k/defconfig: Update defconfigs for v4.12-rc1) Merging m68knommu/for-next (5ed02dbb4974 Linux 4.12-rc3) Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) Merging microblaze/next (83f0124ad81e microblaze: remove asm-generic wrapper headers) Merging mips/mips-for-linux-next (bc53f9c58065 Merge branch '4.12-fixes' into mips-for-linux-next) Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation) Merging openrisc/for-next (8d797f3169d1 openrisc: explicitly include linux/bug.h in asm/fixmap.h) Merging parisc-hd/for-next (5aa2aabff1ce parisc: Stop CPUs via PAT firmware before system halt or reboot.) Merging powerpc/next (83a092cf95f2 powerpc: Link warning for orphan sections) Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE) Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) Merging s390/features (5a4356351194 s390/facilities: remove stfle requirement) Merging sparc-next/master (60925ee97e2b Merge branch 'sparc64-queued-locks') 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 (ce4586063f1a um: Add missing NR_CPUS include) Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next) Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names) 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 (feb4f5b15cea Merge branch 'for-next-next-v4.13-20170529' into for-next-20170529) Merging ceph/master (6ac56951dc10 rbd: implement REQ_OP_WRITE_ZEROES) Merging cifs/for-next (a95cfad947d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) 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 (d8747d642ec4 reiserfs: Make flush bios explicitely sync) Merging ext4/dev (67a7d5f561f4 ext4: fix fdatasync(2) after extent manipulation operations) Merging f2fs/dev (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) 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 (76b2a303384e pNFS/flexfiles: Always attempt to call layoutstats when flexfiles is enabled) Merging nfsd/nfsd-next (b26b78cb7260 nfsd: Fix up the "supattr_exclcreat" attributes) Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly) Merging overlayfs/overlayfs-next (a082c6f680da ovl: filter trusted xattr for non-admin) Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state) Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback) Merging file-locks/linux-next (b0756441db3a fs/locks: don't mess with the address limit in compat_fcntl64) Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next) 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 (719f6a7040f1 printk: Use the main logbuf in NMI when logbuf_lock is available) Merging pci/next (c823e5b95885 Merge branch 'pci/host-xilinx' into next) Merging pstore/for-next/pstore (2f8771861d5f pstore: Don't warn if data is uncompressed and type is not PSTORE_TYPE_DMESG) Merging hid/for-next (698be82b960a Merge branch 'for-4.13/ish' into for-next) Merging i2c/i2c/for-next (e2c824924cdb i2c: designware: Fix bogus sda_hold_time due to uninitialized vars) 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 (9a7967c91695 hwmon: (ibmpowernv) Add highest/lowest attributes to sensors) Merging jc_docs/docs-next (6312811be26f Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook) Merging v4l-dvb/master (36bcba973ad4 [media] mtk_vcodec_dec: return error at mtk_vdec_pic_info_update()) Merging v4l-dvb-next/master (791a9a666d1a Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT) Merging pm/linux-next (0ab35512dd7c Merge branch 'pm-cpufreq' into linux-next) Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next) Merging thermal-soc/next (33011c583fcc Merge branch 'work-linus' into work-next) Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) Merging dlm/next (591c3beb86c4 dlm: Delete an unnecessary variable initialisation in dlm_ls_start()) Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) Merging net-next/master (a5c66b5726a9 Merge branch 'bnxt_en-Misc-updates-for-net-next') Merging ipsec-next/master (d49c9dc1c848 ipv6: remove unused variables in esp6) Merging netfilter-next/master (34158151d2aa netfilter: cttimeout: use nf_ct_iterate_cleanup_net to unlink timeout objs) Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period) Merging wireless-drivers-next/master (98f44cb0655c qtnfmac: introduce new FullMAC driver for Quantenna chipsets) Merging bluetooth/master (a3995460491d net: phy: Relax error checking on sysfs_create_link()) Merging mac80211-next/master (5d473fedd17a mac80211: Invoke TX LED in more code paths) Merging rdma/for-next (67cf3623e097 rxe: expose num_possible_cpus() cnum_comp_vectors) Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux) Merging mtd/master (2ea659a9ef48 Linux 4.12-rc1) Merging l2-mtd/master (c316cf670491 Merge 'v4.12-rc1' into MTD) Merging nand/nand/next (45793dc5bc6c mtd: nand: check ecc->total sanity in nand_scan_tail) Merging spi-nor/spi-nor/next (05d090f00203 mtd: spi-nor: Potential oops on error path in quad_enable()) Merging crypto/master (6507c57bb013 crypto: ccp - Use IPAD/OPAD constant) Merging drm/drm-next (2a1720376add Backmerge tag 'v4.12-rc3' into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (bef8c056fba0 drm/i915/psr: disable psr2 for resolution greater than 32X20) Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown) Merging drm-misc/for-linux-next (7dbcbce9f551 drm/bridge: analogix-anx78xx: Use bridge->mode_valid() callback) 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 (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions) Merging sunxi-drm/sunxi-drm/for-next (a7047675206a drm/sun4i: Add compatible for the A10s pipeline) Merging imx-drm/imx-drm/next (b8f0951de854 gpu: ipu-v3: prg: remove counter load enable) Merging etnaviv/etnaviv/next (d79fd1ccf2cd drm/etnaviv: implement cooling support for new GPU cores) Merging kspp/for-next/kspp (4b49d6a66b06 Merge branch 'for-next/gcc-plugin/randstruct' 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 (7421a1671abe ALSA: pcm: include pcm_local.h and remove some extraneous tabs) Merging sound-asoc/for-next (aed323d42578 Merge remote-tracking branches 'asoc/topic/stm32', 'asoc/topic/sunxi', 'asoc/topic/tlv320dac31xx' and 'asoc/topic/wm-adsp' into asoc-next) Merging modules/modules-next (3e2e857f9c3a module: Add module name to modinfo) Merging input/next (32a62b9441d8 Input: synaptics-rmi4 - change a char type to u8) Merging block/for-next (9c2c43e3c155 Merge branch 'for-4.13/block' into for-next) Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (8c4d04184254 dm kcopyd: add sequential write feature) Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) Merging mmc/next (6e75316c15df mmc: tmio: make sure SDIO gets reinitialized after resume) Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) Merging md/for-next (e153903686de md: report sector of stripes with check mismatches) Merging mfd/for-mfd-next (60194d283dcf mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform) $ git reset --hard HEAD^ Merging next-20170530 version of mfd Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips) Merging battery/for-next (b5910897b2ee power_supply: Add Apple Brick ID power supply type) Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) Merging regulator/for-next (af7a73de20f9 Merge remote-tracking branches 'regulator/topic/settle' and 'regulator/topic/tps65917' into regulator-next) Merging security/next (d68c51e0b377 Sync to mainline for security submaintainers to work against) Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.) Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing) Merging selinux/next (409dcf31538a selinux: Add a cache for quicker retreival of PKey SIDs) Merging tpmdd/next (f175275bfd53 tpm, tpmrm: Mark tpmrm_write as static) Merging watchdog/master (08332893e37a Linux 4.12-rc2) Merging iommu/next (752b80575ea4 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/core', 'x86/vt-d' and 'x86/amd' 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 (7786f6b6dfc1 audit: add ambient capabilities to CAPSET and BPRM_FCAPS records) Merging devicetree/for-next (49e67dd17649 of: fdt: add missing allocation-failure check) Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick) Merging spi/for-next (b8076f1a1d44 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spidev' and 'spi/topic/st-ssc4' into spi-next) Merging tip/auto-latest (8e3c0499d0c9 Merge branch 'x86/urgent') 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 (7d2fdaa694c5 EDAC, mv64x60: Check driver registration success) Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) Merging ftrace/for-next (6ee98ffeea0b x86/ftrace: Make sure that ftrace trampolines are not RWX) Merging rcu/rcu/next (8d7bc0e4318f rcutorture: Select CONFIG_PROVE_LOCKING for Tiny SRCU scenario) Applying: module: Fix pr_fmt() bug for header use of printk Merging kvm/linux-next (08332893e37a Linux 4.12-rc2) Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore) Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (76d837a4c0f9 KVM: PPC: Book3S PR: Don't include SPAPR TCE code on non-pseries platforms) Merging kvms390/next (a2bdbb2c7e70 KVM: s390: ioctls to get and set guest storage attributes) Merging xen-tip/linux-next (c71e6d804c88 xen: make xen_flush_tlb_all() static) Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init) Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next) Merging drivers-x86/for-next (8f8eea643a9c Merge tag 'ib-mfd-gpio-thermal-x86-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into for-next) $ git reset --hard HEAD^ Merging next-20170530 version of drivers-x86 Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit()) Merging leds/for-next (71c17b06ef7d leds: trigger: gpio: Use threaded IRQ) Merging ipmi/for-next (bf10ff69dd6e ipmi_ssif: remove redundant null check on array client->adapter->name) Merging driver-core/driver-core-next (e622ec579b9a doc: update kernel version in sysfs-uevent ABI doc) Merging usb/usb-next (7f7c3cde613d uwb: i1480: add missing goto) Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging usb-serial/usb-next (5ed02dbb4974 Linux 4.12-rc3) Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure) Merging phy-next/next (2ea659a9ef48 Linux 4.12-rc1) Merging tty/tty-next (aa668632ae8c Merge 4.12-rc3 into tty-next) Merging char-misc/char-misc-next (46505c802a55 Revert "firmware: vpd: remove platform driver") Merging extcon/extcon-next (a781a7d646ad extcon: qcom-spmi-misc: add dependency on ARCH_QCOM) Merging staging/staging-next (ca9280d1f82a Merge tag 'iio-for-4.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) Merging mux/for-next (a351e9b9fc24 Linux 4.11) Merging slave-dma/next (2f12f9eac2ae Merge branch 'topic/pl330' into next) Merging cgroup/for-next (41c25707d217 cpuset: consider dying css as offline) Merging scsi/for-next (35f07119477d Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (deaeaca22654 scsi: qla2xxx: Remove an unused structure member) Merging target-updates/for-next (cae4e246117d ibmvscsis: Enable Logical Partition Migration Support) Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) Merging target-bva/for-next (a351e9b9fc24 Linux 4.11) Merging libata/for-next (b8d267c7426a Merge branch 'for-4.13' into for-next) Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) Merging vhost/linux-next (c8b0d7290657 s390/virtio: change maintainership) Merging rpmsg/for-next (0696d197bda1 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (d46c4e22d34b Merge branch 'devel' into for-next) Merging pinctrl/for-next (80e91c89a76f Merge branch 'devel' into for-next) CONFLICT (content): Merge conflict in MAINTAINERS Merging pinctrl-samsung/for-next (16340fd6dbc1 pinctrl: samsung: Split Exynos drivers per ARMv7 and ARMv8) 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 (296990deb389 mnt: Make propagate_umount less slow for overlapping mount propagation trees) Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) Merging random/dev (9dfa7bba35ac fix race in drivers/char/random.c:get_reg()) Merging aio/master (b562e44f507e Linux 4.5) Merging kselftest/next (2ea659a9ef48 Linux 4.12-rc1) 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 (c87a040fb6c5 Merge branch 'for-4.12/upstream-fixes' into for-next) Merging coresight/next (44389a7d12ec coresight: add support for CPU debug module) Merging rtc/rtc-next (7562e54bbd90 rtc: m41t80: add clock provider support) $ git reset --hard HEAD^ Merging next-20170530 version of rtc Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) Merging nvdimm/libnvdimm-for-next (f5705aa8cfed dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case) 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 (efe4e421f00f ipc/util.h: update documentation for ipc_getref() and ipc_putref()) $ git checkout -b akpm remotes/origin/akpm/master Applying: sparc64: NG4 memset 32 bits overflow Applying: xtensa: use generic fb.h Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant Merging akpm/master (a7e75ca7307f lib/crc-ccitt: add CCITT-FALSE CRC16 variant) -- 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
