Hi all, Please do not add any v4.14 material to you linux-next included branches until after v4.13-rc1 has been released. Changes since 20170630: The net-next tree gained conflicts against the arm64 and net trees. The drm tree gained conflicts against the vfs tree. The sound-asoc tree still had its build failure so I applied a supplied patch. The spi tree gained a build failure for which I reverted a commit. The tip tree gained a conflict against the block tree. The target-updates tree gained conflicts against the scsi tree. The nvdimm tree gained conflicts against the vfs tree. Non-merge commits (relative to Linus' tree): 10448 9558 files changed, 756156 insertions(+), 198652 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. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu. Below is a summary of the state of the merge. I am currently merging 266 trees (counting Linus' and 41 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 (79c496816963 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus) Merging fixes/master (97da3854c526 Linux 4.11-rc3) Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig) Merging arc-current/for-curr (c0bc126f97fb Linux 4.12-rc7) Merging arm-current/fixes (9e25ebfe56ec ARM: 8685/1: ensure memblock-limit is pmd-aligned) 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 (d6bd8194e286 powerpc/32: Avoid miscompilation w/GCC 4.6.3 - don't inline copy_to/from_user()) Merging sparc/master (dbd2667a4fb9 sparc64: Fix gup_huge_pmd) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (ea23b42739a2 Merge tag 'mlx5-fixes-2017-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) Merging ipsec/master (ca3a1b856636 esp6_offload: Fix IP6CB(skb)->nhoff for ESP GRO) Merging netfilter/master (91af6ba7ff16 netfilter: ebt_nflog: fix unexpected truncated packet) Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) Merging wireless-drivers/master (35abcd4f9f30 brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()) Merging mac80211/master (4b153ca989a9 Merge tag 'mac80211-for-davem-2017-06-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging sound-current/for-linus (d94815f917da ALSA: hda - Fix endless loop of codec configure) Merging pci-current/for-linus (98dbf5af4fdd PCI: endpoint: Select CRC32 to fix test build error) Merging driver-core.current/driver-core-linus (08332893e37a Linux 4.12-rc2) Merging tty.current/tty-linus (3c2993b8c614 Linux 4.12-rc4) Merging usb.current/usb-linus (dec08194ffec xhci: Limit USB2 port wake support for AMD Promontory hosts) Merging usb-gadget-fixes/fixes (f50b878fed33 USB: gadget: fix GPF in gadgetfs) Merging usb-serial-fixes/usb-linus (996fab55d864 USB: serial: qcserial: new Sierra Wireless EM7305 device ID) Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) Merging phy/fixes (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer) Merging staging.current/staging-linus (41f1830f5a7a Linux 4.12-rc6) Merging char-misc.current/char-misc-linus (32c1431eea48 Linux 4.12-rc5) Merging input-current/for-linus (9768935264c4 Input: synaptics-rmi4 - only read the F54 query registers which are used) Merging crypto-current/master (019d62db5401 crypto: caam - fix gfp allocation flags (part II)) 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 (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names) Merging v4l-dvb-fixes/fixes (2a2599c66368 [media] media: entity: Catch unbalanced media_pipeline_stop calls) 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 (611cdf3695a3 drm/i915: Disable EXEC_OBJECT_ASYNC when doing relocations) Merging drm-misc-fixes/for-linux-next-fixes (e94ac3510b6a drm: Fix GETCONNECTOR regression) Merging kbuild/for-next (3c4bdb1a0329 Merge branches 'misc', 'kbuild' and 'thin-ar' into for-next) Merging uuid/for-next (b86a496a4206 ACPI: hns_dsaf_acpi_dsm_guid can be static) Merging dma-mapping/for-next (1655cf8829d8 ARM: dma-mapping: Remove traces of NOMMU code) Merging asm-generic/master (a351e9b9fc24 Linux 4.11) Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO) Merging arm/for-next (fc256ee00f0c Merge branches 'fixes' and 'misc' into for-next) Merging arm-perf/for-next/perf (c0f7f7acdecd perf: xgene: Add support for SoC PMU version 3) Merging arm-soc/for-next (b0ebfd91e549 arm-soc: document merges) Merging actions/for-next (8ba75fbb148a Merge branch 'v4.13/arm+sps' into next) Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) Merging amlogic/for-next (f99503e956ae 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 (630efea351f0 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) CONFLICT (add/add): Merge conflict in arch/arm/mach-at91/samv7.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/Kconfig Merging bcm2835/for-next (652fb0c6435c Merge branch anholt/bcm2835-defconfig-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 (bf6e15ed7f86 Merge branch 'zte/dt64' into for-next) Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next) Merging mvebu/for-next (cf79eb3aab84 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (b0b111c5f599 Merge branch 'omap-for-v4.13/soc-v4' into for-next) Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) Merging reset/reset/next (dfeac250c429 reset: zx2967: constify zx2967_reset_ops.) Merging qcom/for-next (9c60544280d4 Merge tag 'qcom-drivers-for-4.13' into all-for-4.13-revised) Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next) Merging renesas/next (d75d45bfffd5 Merge branch 'fixes-for-v4.13' into next) Merging rockchip/for-next (dd3f24b9ff88 Merge branch 'v4.13-clk/next' 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 (005537e095a6 Merge branch 'fixes' into for-next) Merging sunxi/sunxi/for-next (efb85d294c2a Merge branches 'sunxi/h3-for-4.13', 'sunxi/dt-for-4.13' and 'sunxi/dt64-for-4.13' into sunxi/for-next) Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next) Merging arm64/for-next/core (425e1ed73e65 arm64: fix endianness annotation for 'struct jit_ctx' and friends) Merging clk/clk-next (3cf50f6b13a2 Merge branch 'binding-doc-cp110-ap806' of git://git.infradead.org/linux-mvebu into clk-next) CONFLICT (content): Merge conflict in MAINTAINERS Merging c6x/for-linux-next (91ebcd1b97ae MAINTAINERS: update email address for C6x maintainer) 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 (204a2be30a7a m68k: Remove ptrace_signal_deliver) Merging m68knommu/for-next (354b6382847d m68k: defconfig: Cleanup from old Kconfig options) Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception) Merging mips/mips-for-linux-next (0ac26eba9a3e 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 (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options) Merging parisc-hd/for-next (247462316f85 parisc: Report SIGSEGV instead of SIGBUS when running out of stack) Merging powerpc/next (bfaa7834b60e powerpc/perf/hv-24x7: Aggregate result elements on POWER9 SMT8) 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 (9e293b5a7062 Merge tag 'nmiforkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into features) Merging sparc-next/master (a718d1392700 sparc64: fix typo in property) Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) 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 (bdf3b55fde37 Merge branch 'xtensa-fixes' into xtensa-for-next) Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool) 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 (4a240ddbe6b5 Merge branch 'for-next-current-v4.12-20170626' into for-next-20170626) Merging ceph/master (4ca2fea6f827 ceph: unify inode i_ctime update) Merging cifs/for-next (bdda26555dd2 cifs: Do not modify mid entry after submitting I/O in cifs_call_async) Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero()) Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) Merging ext3/for_next (08db141b5313 reiserfs: fix race in prealloc discard) Merging ext4/dev (037ee4110538 ext4: require key for truncate(2) of encrypted file) Merging f2fs/dev (01d42209996c f2fs: introduce reserved_blocks in sysfs) Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) Merging fuse/for-next (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation) Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size) Merging nfs/linux-next (e18aca0236a2 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging nfsd/nfsd-next (bb2a8b0cd116 nfsd4: const-ify nfsd4_ops) Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly) Merging overlayfs/overlayfs-next (fbaf94ee3cd5 ovl: don't set origin on broken lower hardlink) 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 (7175a11214f0 xfs: remove a whitespace-only line from xfs_fs_get_nextdqblk) Merging file-locks/linux-next (3832ff35309d btrfs: minimal conversion to errseq_t writeback error reporting on fsync) CONFLICT (content): Merge conflict in include/linux/fs.h Merging vfs/for-next (f55d61bfd7cc Merge branches 'work.misc' and 'work.uaccess' into for-next) CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/arm/include/uapi/asm/Kbuild 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 (f4e981cba2de printk: add __printf attributes to internal functions) Merging pci/next (7a2870cf6161 Merge branch 'pci/host-xilinx' into next) CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_device.c Merging pstore/for-next/pstore (0752e4028c00 powerpc/nvram: use memdup_user) Merging hid/for-next (8b454744e88d Merge branch 'for-4.13/ish' into for-next) Merging i2c/i2c/for-next (25c34d08744f Merge branch 'i2c/for-4.13' 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 (8efa050f19fe firmware: dmi_scan: Check DMI structure length) Merging hwmon-staging/hwmon-next (44b413661b57 hwmon: (aspeed-pwm-tacho) Poll with short sleeps.) Merging jc_docs/docs-next (52b3f239bb69 Docs: clean up some DocBook loose ends) CONFLICT (modify/delete): scripts/kernel-doc-xml-ref deleted in jc_docs/docs-next and modified in HEAD. Version HEAD of scripts/kernel-doc-xml-ref left in tree. $ git rm -f scripts/kernel-doc-xml-ref Merging v4l-dvb/master (2748e76ddb29 media: staging: cxd2099: Activate cxd2099 buffer mode) Merging v4l-dvb-next/master (d9c4615854ec [media] dvb uapi docs: enums are passed by value, not reference) CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-set-voltage.rst CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-set-tone.rst CONFLICT (content): Merge conflict in Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst Merging fbdev/fbdev-for-next (a8feae091106 uvesafb: Fix continuation printks without KERN_LEVEL to pr_cont, neatening) Merging pm/linux-next (3a355360331f Merge branch 'device-properties' 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 (aa647852c32a 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 (a5192c52377e bpf: fix to bpf_setsockops) CONFLICT (content): Merge conflict in include/linux/mlx5/driver.h CONFLICT (content): Merge conflict in drivers/net/wireless/marvell/mwifiex/pcie.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/health.c CONFLICT (content): Merge conflict in arch/arm64/net/bpf_jit_comp.c Applying: remove duplicate ethernet node intruduced by merge Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message) Merging netfilter-next/master (04ba724b659c netfilter: nfnetlink: extended ACK reporting) Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock) Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period) Merging wireless-drivers-next/master (17d9aa66b08d Merge tag 'iwlwifi-next-for-kalle-2017-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) Merging bluetooth/master (a5192c52377e bpf: fix to bpf_setsockops) Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups') Merging rdma/for-next (bc5214ee2922 IB/hfi1: Handle missing magic values in config file) Merging gfs2/for-next (1fc2e8712c81 GFS2: constify attribute_group structures.) Merging mtd/master (05e97a9eda72 Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD) Merging l2-mtd/master (c169e3d3c049 mtd: partitions: fixup some allocate_partition() whitespace) Merging nand/nand/next (edfee3619c49 mtd: nand: mtk: add ->setup_data_interface() hook) Merging spi-nor/spi-nor/next (1a18915b4971 mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables) Merging crypto/master (bcf741cb7792 crypto: testmgr - Reenable sha1/aes in FIPS mode) Merging drm/drm-next (12d016626f99 Merge tag 'drm-amdkfd-next-2017-06-25' of git://people.freedesktop.org/~gabbayo/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_internal.h Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (507ad75736f8 Merge tag 'gvt-fixes-2017-06-29' of https://github.com/01org/gvt-linux into drm-intel-next-fixes) Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy) Merging drm-misc/for-linux-next (138b87fa43b6 drm: vblank: Fix vblank timestamp update) 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 (4a630fadbb29 drm/msm: Fix potential buffer overflow issue) Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables) Merging mali-dp/for-upstream/mali-dp (e40eda3dda1e drm/arm: mali-dp: Use CMA helper for plane buffer address calculation) Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline) Merging imx-drm/imx-drm/next (994fc62e1d04 drm/imx: lock scanout transfers for consecutive bursts) Merging etnaviv/etnaviv/next (46a269da7e8a drm/etnaviv: restore ETNA_PREP_NOSYNC behaviour) Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") Merging regmap/for-next (2c25d66dc22d Merge remote-tracking branches 'regmap/topic/1wire', 'regmap/topic/irq' and 'regmap/topic/lzo' into regmap-next) Merging sound/for-next (d8b53bff0a49 ALSA: pcm: add a documentation for tracepoints) Merging sound-asoc/for-next (2854490cf44b Merge remote-tracking branch 'asoc/topic/zx-aud96p22' into asoc-next) CONFLICT (content): Merge conflict in drivers/of/base.c Applying: of_graph: merge fix up for creating of drivers/of/property.c Applying: ASoC: rt5670: fix incompatible pointer type of set_sysclk Merging modules/modules-next (96b5b19459b3 module: make the modinfo name const) Merging input/next (65938133784a MAINTAINERS: update input subsystem patterns) Merging block/for-next (02d1b34a3cb3 Merge branch 'for-4.13/block' into for-next) CONFLICT (content): Merge conflict in mm/filemap.c CONFLICT (content): Merge conflict in fs/btrfs/inode.c CONFLICT (content): Merge conflict in fs/btrfs/extent_io.h CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c CONFLICT (content): Merge conflict in fs/btrfs/disk-io.h CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c CONFLICT (content): Merge conflict in fs/btrfs/compression.c CONFLICT (content): Merge conflict in fs/block_dev.c CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.h CONFLICT (content): Merge conflict in drivers/s390/block/scm_blk.c CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c CONFLICT (content): Merge conflict in drivers/md/dm-raid1.c CONFLICT (content): Merge conflict in drivers/md/dm-io.c Applying: s390: fix up for "blk-mq: switch ->queue_rq return value to blk_status_t" Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (4d49f1b4a1fc dm raid: stop using BUG() in __rdev_sectors()) Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) Merging mmc/next (e47c0b96678c mmc: dw_mmc: remove the unnecessary slot variable) CONFLICT (content): Merge conflict in drivers/mmc/core/block.c Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) Merging md/for-next (7f053a6a7455 MD: fix a null dereference) Applying: md: fix up for "blk: replace bioset_create_nobvec() with a flags arg to bioset_create()" Merging mfd/for-mfd-next (d905cd268c76 dt-bindings: vendor-prefixes: Add arctic to vendor prefix) Merging backlight/for-backlight-next (7e715c2d9c27 backlight: Report error on failure) Merging battery/for-next (bfa953d336cd power: supply: sbs-battery: Don't needlessly set CAPACITY_MODE) Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) Merging regulator/for-next (d2e00a65b9db Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next) Merging security/next (c4758fa59285 apparmor: put back designators in struct initialisers) Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option) Merging keys/keys-next (3088c2ad40cf Merge remote-tracking branch 'origin/keys-fixes' into keys-next) CONFLICT (content): Merge conflict in security/keys/dh.c Merging selinux/next (6a3911837da0 selinux: enable genfscon labeling for tracefs) Merging tpmdd/next (0608454e2217 tpm: Issue a TPM2_Shutdown for TPM2 devices.) Merging watchdog/master (3a9aedb282ac watchdog: w83627hf: Add support for NCT6793D and NCT6795D) Merging iommu/next (6a7086431fa1 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next) Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) Merging vfio/next (5d6dee80a1e9 vfio: New external user group/file match) Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) Merging audit/next (cd33f5f2cbfa audit: make sure we never skip the multicast broadcast) Merging devicetree/for-next (5e1743c0af9d of: document /sys/firmware/fdt) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/ethernet.txt Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver) Merging spi/for-next (3686c6eae48a Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/st-ssc4' and 'spi/topic/stm32' into spi-next) Applying: Revert "spi: imx: dynamic burst length adjust for PIO mode" Merging tip/auto-latest (bb4002145867 Merge branch 'x86/urgent') CONFLICT (content): Merge conflict in net/bluetooth/hidp/core.c CONFLICT (content): Merge conflict in net/bluetooth/cmtp/core.c CONFLICT (content): Merge conflict in net/bluetooth/bnep/core.c CONFLICT (content): Merge conflict in kernel/irq/affinity.c CONFLICT (content): Merge conflict in drivers/acpi/apei/ghes.c CONFLICT (content): Merge conflict in block/blk-mq-cpumap.c CONFLICT (modify/delete): Documentation/DocBook/kernel-hacking.tmpl deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of Documentation/DocBook/kernel-hacking.tmpl left in tree. $ git rm -f Documentation/DocBook/kernel-hacking.tmpl Applying: sched/wait: fix up for "docs-rst: convert kernel-hacking to ReST" Applying: forgot the semicolons :-( Merging clockevents/clockevents/next (d9569035d594 clocksource: Add an alias macro CLOCKSOURCE_OF_DECLARE) CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h CONFLICT (content): Merge conflict in drivers/clocksource/timer-fttmr010.c CONFLICT (content): Merge conflict in drivers/clocksource/Makefile CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-moxart/Kconfig 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 (164c29244d4b EDAC, pnd2: Fix Apollo Lake DIMM detection) Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) Merging ftrace/for-next (681bec0367c2 tracing: Rename update the enum_map file) Merging rcu/rcu/next (49729e9a4e67 torture: Fix typo suppressing CPU-hotplug statistics) Merging kvm/linux-next (865279c53ca9 tools/kvm_stat: display guest list in pid/guest selection screens) Merging kvm-arm/next (d38338e396ee arm64: Remove a redundancy in sysreg.h) CONFLICT (content): Merge conflict in Documentation/arm64/silicon-errata.txt Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (8b24e69fc47e KVM: PPC: Book3S HV: Close race with testing for signals on guest entry) Merging kvms390/next (d52cd2076eb2 KVM: s390: Inject machine check into the nested guest) CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h CONFLICT (content): Merge conflict in arch/s390/kvm/gaccess.c CONFLICT (content): Merge conflict in arch/s390/include/asm/kvm_host.h Merging xen-tip/linux-next (a5d5f328b0e2 xen: allocate page for shared info page from low memory) CONFLICT (content): Merge conflict in drivers/xen/events/events_base.c Merging percpu/for-next (e3efe3db932b percpu: fix static checker warnings in pcpu_destroy_chunk) Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next) Merging drivers-x86/for-next (d791db9a57ab platform/x86: sony-laptop: constify attribute_group and input index array) Merging chrome-platform/for-next (5d6a312e8f99 platform/chrome: cros_ec_lightbar - hide unused PM functions) Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions) Merging leds/for-next (4d1707c1c690 leds: lp55xx: make various arrays static const) Merging ipmi/for-next (1e7a75f74a19 char: ipmi: constify bmc_dev_attr_group and bmc_device_type) Merging driver-core/driver-core-next (d565ed38d045 arm: mach-rpc: ecard: fix build error) Merging usb/usb-next (6836796de401 Add USB quirk for HVR-950q to avoid intermittent device resets) CONFLICT (modify/delete): drivers/usb/misc/ucsi.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/ucsi.c left in tree. $ git rm -f drivers/usb/misc/ucsi.c Applying: usb: typec: fix for "ACPI: Switch to use generic guid_t in acpi_evaluate_dsm()" Merging usb-gadget/next (0591bc236015 usb: gadget: add f_uac1 variant based on a new u_audio api) Merging usb-serial/usb-next (c22ac6d29f18 USB: serial: propagate late probe errors) Merging usb-chipidea-next/ci-for-usb-next (c4a0bbbdb7f6 usb: chipidea: properly handle host or gadget initialization failure) Merging phy-next/next (af850e14a7ae phy: bcm-ns-usb3: add MDIO driver using proper bus layer) Merging tty/tty-next (a6d7514b14a6 tty: serial: lpuart: add a more accurate baud rate calculation method) CONFLICT (content): Merge conflict in include/linux/platform_data/atmel.h Merging char-misc/char-misc-next (cbbdc6082917 misc: apds990x: Use sysfs_match_string() helper) CONFLICT (content): Merge conflict in Documentation/admin-guide/index.rst CONFLICT (modify/delete): Documentation/DocBook/w1.tmpl deleted in HEAD and modified in char-misc/char-misc-next. Version char-misc/char-misc-next of Documentation/DocBook/w1.tmpl left in tree. $ git rm -f Documentation/DocBook/w1.tmpl Applying: docs-rst: merge fix for "DocBook: w1: Update W1 file locations and names in DocBook" Merging extcon/extcon-next (1f4be24786b8 extcon: int3496: Switch to devm_acpi_dev_add_driver_gpios()) Merging staging/staging-next (9b326dfce12a staging: lustre: replace kmalloc with kmalloc_array) CONFLICT (content): Merge conflict in include/uapi/linux/tty.h Merging mux/for-next (a351e9b9fc24 Linux 4.11) Merging slave-dma/next (56cede404f4f Merge branch 'for-linus' into next) Merging cgroup/for-next (5136f6365ce3 cgroup: implement "nsdelegate" mount option) Merging scsi/for-next (48d9c49d7106 Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/scsi_transport_fc.c CONFLICT (content): Merge conflict in drivers/scsi/scsi_lib.c Merging scsi-mkp/for-next (c345c6ca1382 qla2xxx: Fix NVMe entry_type for iocb packet on BE system) Merging target-updates/for-next (bc1bb269ef7b qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd use during TMR ABORT) CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/tcm_qla2xxx.c CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c Applying: target_update: small mismerge fix Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1) Merging libata/for-next (af62e4938e3c 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 (e41b1355508d virtio_balloon: disable VIOMMU support) Merging rpmsg/for-next (9ef2b6cc595a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (a4196d365937 Merge branch 'devel' into for-next) Merging pinctrl/for-next (cf342f7302c0 Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (a453f3693f2a pinctrl: samsung: Explicitly cast pointer returned by of_iomap() to iomem) 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 (e2682130931f random: suppress spammy warnings about unseeded randomness) Merging aio/master (b562e44f507e Linux 4.5) Merging kselftest/next (e67f85fb96ca selftests: membarrier: use ksft_* var arg msg api) CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in Documentation/dev-tools/index.rst 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 (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next) Merging coresight/next (92cd7037795e arm64: dts: qcom: msm8916: Add debug unit) Merging rtc/rtc-next (9f4ad359c801 rtc: brcmstb-waketimer: Add Broadcom STB wake-timer) Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) Merging nvdimm/libnvdimm-for-next (6f4991d511f8 Merge branch 'for-4.13/dax' into libnvdimm-for-next) CONFLICT (content): Merge conflict in lib/iov_iter.c CONFLICT (content): Merge conflict in include/linux/uio.h 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 kspp/for-next/kspp (cb00e6b58abb Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp) CONFLICT (content): Merge conflict in include/linux/fs.h Merging akpm-current/current (f33857ea9f81 ipc/util.h: update documentation for ipc_getref() and ipc_putref()) CONFLICT (content): Merge conflict in kernel/power/snapshot.c CONFLICT (content): Merge conflict in include/linux/sem.h CONFLICT (content): Merge conflict in include/linux/ipc.h $ git checkout -b akpm remotes/origin/akpm/master Applying: net/netfilter/x_tables.c: use kvmalloc() in xt_alloc_table_info() Applying: kernel/watchdog: remove unused declaration Applying: kernel/watchdog: introduce arch_touch_nmi_watchdog() Applying: kernel/watchdog: split up config options Applying: watchdog-split-up-config-options-fix Applying: kernel/watchdog: provide watchdog_nmi_reconfigure() for arch watchdogs Applying: watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix Applying: kernel/watchdog: hide unused function Applying: powerpc/64s: implement arch-specific hardlockup watchdog Applying: powerpc/64s: watchdog honor watchdog disable at boot/hotplug Applying: powerpc-64s-implement-arch-specific-hardlockup-watchdog-checkpatch-fixes Applying: efi: avoid fortify checks in EFI stub Applying: kexec_file: adjust declaration of kexec_purgatory Applying: IB/rxe: do not copy extra stack memory to skb Applying: powerpc: don't fortify prom_init Applying: powerpc: make feature-fixup tests fortify-safe Applying: include/linux/string.h: add the option of fortified string.h functions Applying: x86: fix fortified memcpy Applying: fortify: avoid panic() in favor of BUG() Applying: sh: mark end of BUG() implementation as unreachable Applying: random,stackprotect: introduce get_random_canary function Applying: fork,random: use get_random_canary() to set tsk->stack_canary Applying: x86: ascii armor the x86_64 boot init stack canary Applying: arm64: ascii armor the arm64 boot init stack canary Applying: sh64: ascii armor the sh64 boot init stack canary Applying: x86/mmap: properly account for stack randomization in mmap_base Applying: arm64/mmap: properly account for stack randomization in mmap_base Applying: powerpc,mmap: properly account for stack randomization in mmap_base Applying: MIPS: do not use __GFP_REPEAT for order-0 request Applying: mm, tree wide: replace __GFP_REPEAT by __GFP_RETRY_MAYFAIL with more useful semantic Applying: mm-tree-wide-replace-__gfp_repeat-by-__gfp_retry_mayfail-with-more-useful-semantic-fix Applying: mm-tree-wide-replace-__gfp_repeat-by-__gfp_retry_mayfail-with-more-useful-semantic-fix Applying: mm-tree-wide-replace-__gfp_repeat-by-__gfp_retry_mayfail-with-more-useful-semantic-fix-3 Applying: xfs: map KM_MAYFAIL to __GFP_RETRY_MAYFAIL Applying: mm: kvmalloc support __GFP_RETRY_MAYFAIL for all sizes Applying: drm/i915: use __GFP_RETRY_MAYFAIL Applying: mm, migration: do not trigger OOM killer when migrating memory Applying: mm/memory-hotplug: switch locking to a percpu rwsem Applying: sparc64: NG4 memset 32 bits overflow Applying: xtensa: use generic fb.h Applying: MAINTAINERS: give kmod some maintainer love Applying: kmod: add test driver to stress test the module loader Applying: kmod: throttle kmod thread limit Applying: writeback: rework wb_[dec|inc]_stat family of functions Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant Merging akpm/master (91a7df0fbd31 lib/crc-ccitt: add CCITT-FALSE CRC16 variant) Applying: net/mlx5: fix memcpy limit? -- 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
