From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: Tree for Feb 6 Date: Tue, 6 Feb 2018 14:38:35 +1100 Message-ID: <20180206143835.163e11ac@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/.6g=uQsm/g==Lrn+6F7zCZw"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Linux-Next Mailing List Cc: Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org --Sig_/.6g=uQsm/g==Lrn+6F7zCZw Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Please do not add any v4.17 material to your linux-next included branches until after v4.16-rc1 has been released. Changes since 20180205: Linus' tree lost its build failure. The tip tree gained conflicts against Linus' tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 1725 2368 files changed, 64906 insertions(+), 31510 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, an allmodconfig 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 (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 256 trees (counting Linus' and 44 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. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (e237f98a9c13 Merge tag 'xfs-4.16-merge-5' of git://g= it.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging fixes/master (e237f98a9c13 Merge tag 'xfs-4.16-merge-5' of git://gi= t.kernel.org/pub/scm/fs/xfs/xfs-linux) Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gi= tignore) Merging arc-current/for-curr (827cc2fa024d ARC: Fix malformed ARC_EMUL_UNAL= IGNED default) Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call in= dex) Merging m68k-current/for-linus (2334b1ac1235 MAINTAINERS: Add NuBus subsyst= em entry) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (1b689a95ce74 powerpc/pseries: include linux/ty= pes.h in asm/hvcall.h) Merging sparc/master (aebb48f5e465 sparc64: fix typo in CONFIG_CRYPTO_DES_S= PARC64 =3D> CONFIG_CRYPTO_CAMELLIA_SPARC64) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (23ddd2612d0e dwc-xlgmac: remove Jie Deng as co-maintain= er) Merging bpf/master (09584b406742 bpf: fix selftests/bpf test_kmod.sh failur= e when CONFIG_BPF_JIT_ALWAYS_ON=3Dy) Merging ipsec/master (545d8ae7afff xfrm: fix boolean assignment in xfrm_get= _type_offload) Merging netfilter/master (992cfc7c5d10 netfilter: nft_flow_offload: no need= to flush entries on module removal) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension ho= ok mask only if set) Merging wireless-drivers/master (a9e6d44ddecc ssb: Do not disable PCI host = on non-Mips) Merging mac80211/master (c4de37ee2b55 mac80211: mesh: fix wrong mesh TTL of= fset calculation) Merging rdma-fixes/for-rc (ae59c3f0b6cf RDMA/mlx5: Fix out-of-bound access = while querying AH) Merging sound-current/for-linus (1c9609e3a8cf ALSA: hda - Reduce the suspen= d time consumption for ALC256) Merging pci-current/for-linus (838cda369707 x86/PCI: Enable AMD 64-bit wind= ow on resume) Merging driver-core.current/driver-core-linus (35277995e179 Merge branch 'x= 86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging tty.current/tty-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of gi= t://people.freedesktop.org/~airlied/linux) Merging usb.current/usb-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of gi= t://people.freedesktop.org/~airlied/linux) Merging usb-gadget-fixes/fixes (b2cd1df66037 Linux 4.15-rc7) Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add n= ew device ID ELV ALC 8xxx) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: m= sm: fix ulpi-node lookup) Merging phy/fixes (2b88212c4cc6 phy: rcar-gen3-usb2: select USB_COMMON) Merging staging.current/staging-linus (35277995e179 Merge branch 'x86-pti-f= or-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging char-misc.current/char-misc-linus (35277995e179 Merge branch 'x86-p= ti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging input-current/for-linus (0004520af32f Input: mms114 - add SPDX iden= tifier) Merging crypto-current/master (2d55807b7f7b crypto: picoxcell - Fix error h= andling in spacc_probe()) Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') Merging vfio-fixes/for-linus (563b5cbe334e iommu/arm-smmu-v3: Cope with dup= licated Stream IDs) Merging kselftest-fixes/fixes (ae64f9bd1d36 Linux 4.15-rc2) Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711= _bl: fix device-tree node leaks) Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode = check) Merging spi-nor-fixes/spi-nor/fixes (10a6a6975691 Revert "dt-bindings: mtd:= add sst25wf040b and en25s64 to sip-nor list") Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during= shutdown) Merging v4l-dvb-fixes/fixes (781b045baefd media: imx274: Fix error handling= , add MAINTAINERS entry) Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bi= t compilation) Merging mips-fixes/mips-fixes (0cde5b44a30f MIPS: TXx9: use IS_BUILTIN() fo= r CONFIG_LEDS_CLASS) Merging kvm-fixes/master (d8a5b80568a9 Linux 4.15) Merging kvms390-fixes/master (1de1ea7efeb9 KVM: s390: add proper locking fo= r CMMA migration bitmap) Merging drm-intel-fixes/for-linux-next-fixes (d8a5b80568a9 Linux 4.15) Merging drm-misc-fixes/for-linux-next-fixes (54f809cfbd6b drm/atomic: Fix m= emleak on ERESTARTSYS during non-blocking commits) Merging kbuild/for-next (53a7bc8937df Merge branch 'kconfig' into for-next) Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) Merging dma-mapping/for-next (04f56534786c MAINTAINERS: add the iommu list = for swiotlb and xen-swiotlb) Merging asm-generic/master (a351e9b9fc24 Linux 4.11) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (3a175cdf4392 Merge branches 'fixes', 'misc', 'sa1111'= and 'sa1100-for-next' into for-next) Merging arm-perf/for-next/perf (7520fa99246d perf: ARM DynamIQ Shared Unit = PMU support) Merging arm-soc/for-next (2aa127e4d579 Merge branches 'next/dt' and 'next/d= rivers' into for-next) Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into ne= xt) Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid cl= ock-frequency values) Merging amlogic/for-next (ea879b13a92b Merge branch 'v4.16/dt64' into tmp/a= ml-rebuild) Merging aspeed/for-next (8203ca9789bc Merge branch 'dt-for-v4.16' into for-= next) Merging at91/at91-next (fa4cf68ab4b1 Merge tag 'at91-ab-4.16-dt' into at91-= next) Merging bcm2835/for-next (a6189bcc0012 Merge branch anholt/bcm2835-drivers-= next into for-next) Merging imx-mxs/for-next (824162aa1454 Merge branch 'imx/defconfig' into fo= r-next) Merging keystone/next (a29b8b93e158 Merge branch 'for_4.16/keystone-config'= into next) Merging mvebu/for-next (91cbd0893d7d Merge branch 'mvebu/dt64' into mvebu/f= or-next) Merging omap/for-next (e38c38728951 Merge branch 'omap-for-v4.16/ti-sysc' i= nto for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/dra7.dtsi Merging reset/reset/next (70d2f16a6289 reset: meson: enable level reset sup= port on Meson8b) Merging qcom/for-next (f5788d2f2929 Merge tag 'qcom-arm64-defconfig-for-4.1= 6' into tagged-for-4.16) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (b214f9f550fd Merge branches 'fixes-for-v4.15' and 'dt= -for-v4.16' into next) Merging rockchip/for-next (5432915256e7 Merge branch 'v4.16-armsoc/dts64fix= es' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (3b6327365aba Merge branch 'next/dt' into for= -next) Merging sunxi/sunxi/for-next (d7ec2c507677 Merge branch 'sunxi/fixes-for-4.= 15' into sunxi/for-next) Merging tegra/for-next (983371acdeda Merge branch for-4.16/arm64/dt into fo= r-next) Merging arm64/for-next/core (ec89ab50a03a arm64: Fix TTBR + PAN + 52-bit PA= logic in cpu_do_switch_mm) Merging clk/clk-next (c43a52cfd27b Merge branches 'clk-aspeed', 'clk-lock-U= P', 'clk-mediatek' and 'clk-allwinner' into clk-next) Merging clk-samsung/for-next (7685570f2ae2 clk: samsung: s3c: Remove unneed= ed enumeration) Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c get_c= oreid build error) Merging cris/for-next (fd989db807a0 cris: Fix conflicting types for _etext,= _edata, _end) Merging m68k/for-next (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) Merging m68knommu/for-next (0d665e7b109d mm, page_vma_mapped: Drop faulty p= ointer arithmetics in check_pte()) Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) Merging microblaze/next (7b6ce52be3f8 microblaze: Setup proper dependency f= or optimized lib functions) Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-fea= tures' and 'octeon-3-net-mips-bits' into mips-next) Merging mips-james/mips-next (91d9f8fcf7cc MIPS: SMP-CPS: Remove duplicate = assignment of core in play_dead) Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles = only if initialized) Merging openrisc/for-next (0fedb7653af7 openrisc: remove unused __ARCH_HAVE= _MMU define) Merging parisc-hd/for-next (bebc6082da0a Linux 4.14) Merging powerpc/next (015eb1b89e95 powerpc/mm/radix: Fix build error when R= ADIX_MMU=3Dn) Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_= device) Merging risc-v/for-next (4889dec6c87d riscv: inline set_pgdir into its only= caller) Merging s390/features (e2dd833389cc s390: add optimized array_index_mask_no= spec) Merging sparc-next/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_= time') Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspac= e addresses) Merging uml/linux-next (02eb0b11eab5 um: Add missing EXPORT for free_irq_by= _fd()) Merging xtensa/xtensa-for-next (73b37067623c xtensa: fix futex_atomic_cmpxc= hg_inatomic) Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc ve= rsions) Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding stan= dard issues) Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs wh= en under IO limits) Applying: f2fs: fixup for cgroup/writeback change Merging btrfs-kdave/for-next (d69a3372bba2 Merge branch 'for-next-next-v4.1= 6-20180130' into for-next-20180130) Merging ceph/master (16515a6d5418 ceph: improving efficiency of syncfs) Merging cifs/for-next (022bdb0c463e [SMB3] Add missing structs and defines = from recent SMB3.1.1 documentation) Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type con= st) Merging ecryptfs/next (4670269faba7 eCryptfs: constify attribute_group stru= ctures.) Merging ext3/for_next (f463589a7cd2 ext2: drop unneeded newline) Merging ext4/dev (5dc397113d19 ext4: create ext4_kset dynamically) Merging f2fs/dev (1c1d35df7110 f2fs: support inode creation time) Merging fuse/for-next (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry) Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) Merging nfs/linux-next (e231c6879cfd NFS: Fix a race between mmap() and O_D= IRECT) Merging nfs-anna/linux-next (c54c14ba000d xprtrdma: Spread reply processing= over more CPUs) CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c CONFLICT (content): Merge conflict in net/sunrpc/xprt.c Merging nfsd/nfsd-next (3ac71a649c3d nfsd: store stat times in fill_pre_wcc= () instead of inode times) CONFLICT (content): Merge conflict in fs/nfsd/nfsfh.h Merging orangefs/for-next (db0267e7afc7 orangefs: call op_release sooner wh= en creating inodes) Merging overlayfs/overlayfs-next (9b6faee07470 ovl: check ERR_PTR() return = value from ovl_encode_fh()) Merging ubifs/linux-next (7f29ae9f977b ubi: block: Fix locking for idr_allo= c/idr_remove) Merging xfs/for-next (76883f7988e6 xfs: remove experimental tag for reverse= mapping) Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/= scm/linux/kernel/git/davem/sparc) Merging vfs/for-next (27f005e635c6 Merge branch 'misc.netdrv' into for-next) Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsy= nc()) Merging iversion/iversion-next (bec5a1426bb8 Rename make inode_cmp_iversion= {+raw} to inode_eq_iversion{+raw}) Merging printk/for-next (bb4f552a598d Merge branch 'for-4.16-console-waiter= -logic' into for-4.16) Merging pci/next (ab8c609356fb Merge branch 'pci/spdx' into next) CONFLICT (content): Merge conflict in include/linux/pci.h CONFLICT (content): Merge conflict in drivers/of/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/eeh-po= wernv.c Applying: PCI: fix up for "powerpc/eeh: Update VF config space after EEH" Merging pstore/for-next/pstore (a99f41a1b441 fs: pstore: remove unused hard= irq.h) Merging hid/for-next (494622678bc9 Merge branch 'for-4.16/hid-quirks-cleanu= p/toshiba' into for-next) Merging i2c/i2c/for-next (a2cdd4be7a2c Merge branch 'i2c/for-4.16' into i2c= /for-next) CONFLICT (content): Merge conflict in drivers/i2c/i2c-core-smbus.c Merging dmi/master (36a840c73dc6 firmware: dmi: handle missing DMI data gra= cefully) Merging hwmon-staging/hwmon-next (6fbc4232a5ac hwmon: (dell-smm) Disable fa= n support for Dell Vostro 3360) Merging jc_docs/docs-next (54e36a2dc554 Documentation/admin-guide: fixes fo= r thunderbolt.rst) Merging v4l-dvb/master (273caa260035 media: v4l2-compat-ioctl32.c: make ctr= l_is_pointer work for subdevs) CONFLICT (modify/delete): include/media/lirc_dev.h deleted in v4l-dvb/maste= r and modified in HEAD. Version HEAD of include/media/lirc_dev.h left in tr= ee. CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_zilog.c deleted i= n v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/medi= a/lirc/lirc_zilog.c left in tree. CONFLICT (content): Merge conflict in drivers/media/rc/lirc_dev.c CONFLICT (content): Merge conflict in drivers/media/dvb-core/dmxdev.c $ git rm -f include/media/lirc_dev.h drivers/staging/media/lirc/lirc_zilog.c Applying: media: videobuf2: fix up for "media: annotate ->poll() instances" Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: ref= actor compat ioctl32 logic) Merging fbdev/fbdev-for-next (5865889fe431 video: udlfb: Switch from the pr= _*() to the dev_*() logging functions) Merging pm/linux-next (5ddc28ac7f3b Merge branches 'acpi-processor' and 'ac= pi-battery' into linux-next) Merging cpupower/cpupower (0e96a0c83f08 cpupower: Remove FSF address) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (e856f078bcf1 OPP: Introduce "required-opp" prop= erty) Merging thermal/next (134f4010799a Merge branches 'thermal-core', 'thermal-= intel' and 'thermal-soc' into next) Merging thermal-soc/next (d0ecbbbe518e thermal/drivers/hisi: Remove bogus c= onst from function return type) Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversize= d DMA reads on JMicron controllers) Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump) Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb= _get_sgtable callback) Merging net-next/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git= ://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) Merging bpf-next/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git= ://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) Merging ipsec-next/master (255442c93843 Merge tag 'docs-4.16' of git://git.= lwn.net/linux) Merging netfilter-next/master (c746fc0e8b2d cxgb4: add geneve offload suppo= rt for T6) Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET su= pport) Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[= ' error.) Merging wireless-drivers-next/master (cbbde7e8d985 mt76: do not set status-= >aggr for NULL data frames) Merging bluetooth/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of gi= t://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) Merging mac80211-next/master (ff84e7bfe176 mac80211: Add support to notify = ht/vht opmode modification.) Merging rdma/for-next (e9d1e389273a IB/uverbs: Use the standard kConfig for= mat for experimental) Merging gfs2/for-next (35277995e179 Merge branch 'x86-pti-for-linus' of git= ://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging mtd/master (fee4380f368e mtd: nand: pxa3xx: Fix READOOB implementat= ion) Merging l2-mtd/mtd/next (571cb17b23ec Merge tag 'nand/for-4.16' of git://gi= t.infradead.org/linux-mtd into mtd/next) Merging nand/nand/next (f4c6cd1a7f22 mtd: nand: sunxi: Fix ECC strength cho= ice) Merging spi-nor/spi-nor/next (23bae78e8a57 mtd: mtk-nor: modify functions' = name more generally) Merging crypto/master (2d55807b7f7b crypto: picoxcell - Fix error handling = in spacc_probe()) Merging drm/drm-next (b8a89f530f56 Merge branch 'linux-4.16' of git://githu= b.com/skeggsb/linux into drm-next) Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add s= upport for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (751b01cb07eb drm/i915/ppgtt: Pin page dir= ectories before allocation) Merging drm-tegra/drm/tegra/for-next (8f62142e490d drm/tegra: dc: Properly = cleanup overlay planes) Merging drm-misc/for-linux-next (761e05a702f5 drm: Check for lessee in DROP= _MASTER ioctl) Merging drm-msm/msm-next (51f55992d13b drm/msm/adreno: Use generic function= to load firmware to a buffer object) Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances o= f drm_dev_unref with drm_dev_put.) Merging mali-dp/for-upstream/mali-dp (54243016ae35 drm: mali-dp: Disable pl= anes when their CRTC gets disabled.) Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/dr= m-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) Merging imx-drm/imx-drm/next (4cfea3c1f271 gpu: ipu-v3: allow to build with= COMPILE_TEST) Merging etnaviv/etnaviv/next (a181196c86e1 drm/etnaviv: remove the need for= a gpu-subsystem DT node) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (a75de7721184 Merge remote-tracking branches 'regma= p/topic/soundwire' and 'regmap/topic/zero' into regmap-next) Merging sound/for-next (1c9609e3a8cf ALSA: hda - Reduce the suspend time co= nsumption for ALC256) Merging sound-asoc/for-next (8639e3c49869 Merge tag 'asoc-v4.16-3' into aso= c-next) Merging modules/modules-next (0cad61d7a3d5 modpost: Remove trailing semicol= on) Merging input/next (10a558374f37 Merge tag 'v4.15' into next) Merging block/for-next (0ccfb3c0032b Merge branch 'for-4.16/block' into for= -next) Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pb= lk-init.c) Merging device-mapper/for-next (de6ff5c58656 Merge branch 'dm-4.16' into bl= ock-4.16_dm-4.16) CONFLICT (content): Merge conflict in include/linux/blk_types.h CONFLICT (content): Merge conflict in block/blk-mq.c CONFLICT (content): Merge conflict in block/blk-core.c Merging mmc/next (56174d9a2149 mmc: MMC_SDHI_{SYS,INTERNAL}_DMAC should dep= end on HAS_DMA) Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlappin= g memcpy) Merging md/for-next (1532d9e87e8b raid5-ppl: PPL support for disks with wri= te-back cache enabled) Merging mfd/for-mfd-next (0f89ffefa4e1 mfd: lpc_ich: Do not touch SPI-NOR w= rite protection bit on Apollo Lake) Merging backlight/for-backlight-next (2023b0524a63 backlight: tdo24m: Fix t= he SPI CS between transfers) Merging battery/for-next (8be4c3667cf1 MAINTAINERS: Add AXP288 PMIC entry) Merging regulator/for-next (c8f64f281824 Merge remote-tracking branch 'regu= lator/fix/suspend' into regulator-linus) Merging security/next-testing (400f428062af Merge branch 'next-integrity' o= f git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into = next-testing) Merging integrity/next-integrity (d56f30ac85c0 ima: force re-appraisal on f= ilesystems with FS_IMA_NO_CACHE) CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to preve= nt tainting) Merging selinux/next (4b14752ec4e0 selinux: skip bounded transition process= ing if the policy isn't loaded) Merging tpmdd/next (68021bf4734d tpm: remove unused variables) Merging watchdog/master (592a547adf68 documentation: watchdog: remove docum= entation of w83697hf_wdt/w83697ug_wdt) Merging iommu/next (fedbd940d1c2 Merge branches 'arm/renesas', 'arm/omap', = 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table alloca= tion) Merging vfio/next (46ed90f157f4 vfio: mdev: make a couple of functions and = structure vfio_mdev_driver static) Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig) Merging audit/next (d8a5b80568a9 Linux 4.15) Merging devicetree/for-next (3a6fbcb2e2e4 xtensa: remove arch specific earl= y DT functions) Merging mailbox/mailbox-for-next (0ae7d327a64b dt-bindings: mailbox: qcom: = Document the APCS clock binding) Merging spi/for-next (d0cb047a0edb Merge tag 'spi-v4.16' into spi-next) Merging tip/auto-latest (724aba33d0a5 Merge branch 'x86/urgent') CONFLICT (content): Merge conflict in include/linux/sched/mm.h CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/arm64/kernel/entry.S Applying: membarrier: fix up for mmdrop move Merging clockevents/clockevents/next (322fd24f5e67 clocksource/drivers/stm3= 2: Start the timer's counter sooner) CONFLICT (content): Merge conflict in drivers/clocksource/timer-stm32.c CONFLICT (content): Merge conflict in drivers/clocksource/timer-of.c CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://gi= t.kernel.org/pub/scm/linux/kernel/git/bp/bp) Merging edac-amd/for-next (68fa24f9121c EDAC, mv64x60: Fix an error handlin= g path) Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) Merging ftrace/for-next (841a915d20c7 vsprintf: Do not have bprintf derefer= ence pointers) Merging rcu/rcu/next (1dfa55e01987 Merge branches 'cond_resched.2017.12.04a= ', 'dyntick.2017.11.28a', 'fixes.2017.12.11a', 'srbd.2017.12.05a' and 'tort= ure.2017.12.11a' into HEAD) Merging kvm/linux-next (8dbfb2bf1bb3 KVM: x86: don't forget vcpu_put() in k= vm_arch_vcpu_ioctl_set_sregs()) CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c Merging kvm-arm/next (cd15d2050c04 KVM: arm/arm64: Fixup userspace irqchip = static key optimization) Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement T= LBR for T&E) Merging kvm-ppc/kvm-ppc-next (9b9b13a6d153 KVM: PPC: Book3S HV: Keep XIVE e= scalation interrupt masked unless ceded) Merging kvms390/next (4b9f952577fb KVM: s390: introduce the format-1 GISA) Merging xen-tip/linux-next (cf2acf66ad43 xen/gntdev: Fix partial gntdev_mma= p() cleanup) Merging percpu/for-next (85dcbba3b8b1 percpu: percpu_counter_initialized ca= n be boolean) Merging workqueues/for-next (a10eb37ccf1d Merge branch 'for-4.15-fixes' int= o for-next) Merging drivers-x86/for-next (661405bd817b platform/x86: intel_pmc_core: Sp= ecial case for Coffeelake) CONFLICT (content): Merge conflict in drivers/platform/x86/dell-laptop.c Merging chrome-platform/for-next (d48b8c58c57f platform/chrome: Use proper = protocol transfer function) Merging hsi/for-next (b6dc80dbe6cd HSI: cmt_speech: use timespec64 instead = of timespec) Merging leds/for-next (6a836631e303 leds: ledtrig-transient: Add SPDX licen= se identifiers) Merging ipmi/for-next (e45af3d372f1 ipmi_ssif: Remove duplicate NULL check) Merging driver-core/driver-core-next (35277995e179 Merge branch 'x86-pti-fo= r-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging usb/usb-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://peopl= e.freedesktop.org/~airlied/linux) Merging usb-gadget/next (8ada211d0383 usb: renesas_usbhs: add extcon notifi= er to set mode for non-otg channel) Merging usb-serial/usb-next (d1c48227d7c4 USB: serial: f81534: fix tx error= on some baud rate) Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx:= Fix ULPI on imx53) Merging phy-next/next (e4b227c1ca70 phy: phy-mtk-tphy: use of_device_get_ma= tch_data()) Merging tty/tty-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://peopl= e.freedesktop.org/~airlied/linux) Merging char-misc/char-misc-next (35277995e179 Merge branch 'x86-pti-for-li= nus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging extcon/extcon-next (ca90a64dc671 extcon: axp288: Handle reserved ch= arger-type values better) Merging staging/staging-next (35277995e179 Merge branch 'x86-pti-for-linus'= of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging mux/for-next (6cd361c99ef2 mux: add SPDX identifiers to all mux sou= rce files) Merging slave-dma/next (6c773ba2c843 Merge branch 'for-linus' into next) Merging cgroup/for-next (5ecf66c9dc2b Merge branch 'for-4.16' into for-next) Merging scsi/for-next (f468cd2908f8 Merge branch 'postmerge' into for-next) Merging scsi-mkp/for-next (a2390348c19d scsi: qla2xxx: Fix logo flag for ql= t_free_session_done()) Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wa= ke up sleeping login worker) Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging libata/for-next (83ab14e6cacc Merge branch 'for-4.16' into for-next) Merging vhost/linux-next (d25cc43c6775 vhost: don't hold onto file pointer = for VHOST_SET_LOG_FD) Merging rpmsg/for-next (163c558b84fe Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (d58f2bf261fd gpio: Timestamp events in hardirq handl= er) Merging pinctrl/for-next (02e389e63e35 pinctrl: mcp23s08: fix irq setup ord= er) Merging pinctrl-samsung/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging pwm/for-next (bccaa3f917c9 pwm: meson: Add clock source configurati= on for Meson-AXG) Merging userns/for-next (9eba1cd4b565 24 Jan 2018 Merge of my siginfo and u= serns trees for testing in linux-next) Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does h= onor the timeout) Merging random/dev (9e66317d3c92 Linux 4.14-rc3) Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and c= ounting against aio-max-nr) Merging kselftest/next (0e9e327d1622 selftests: vm: update .gitignore with = missing generated file) Merging y2038/y2038 (69973b830859 Linux 4.9) Merging livepatching/for-next (d13f5d84ca27 Merge branch 'for-4.16/signal-s= ysfs-force-v2' into for-next) Merging coresight/next (d8a5b80568a9 Linux 4.15) Merging rtc/rtc-next (4402be2b4ca7 rtc: remove rtc-at32ap700x) Merging nvdimm/libnvdimm-for-next (ee95f4059a83 Merge branch 'for-4.16/nfit= ' into libnvdimm-for-next) CONFLICT (modify/delete): arch/powerpc/sysdev/axonram.c deleted in HEAD and= modified in nvdimm/libnvdimm-for-next. Version nvdimm/libnvdimm-for-next o= f arch/powerpc/sysdev/axonram.c left in tree. CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig $ git rm -f arch/powerpc/sysdev/axonram.c Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in L= DFLAGS too) Merging at24/at24/for-next (0f30aca72c3b eeprom: at24: extend the list of c= hips supported in DT) Merging ntb/ntb-next (3b28c987fb95 NTB: ntb_perf: fix cast to restricted __= le32) Merging kspp/for-next/kspp (531d5f7f5d13 socket: Provide put_cmsg_whitelist= () for constant size copies) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging akpm-current/current (902897dc0c88 ipc/mqueue.c: have RT tasks queu= e in by priority in wq_add()) $ git checkout -b akpm remotes/origin/akpm/master Applying: ipc/mqueue: add missing error code in init_mqueue_fs() Applying: net/netfilter/x_tables.c: remove size check Applying: arch/score/kernel/setup.c: combine two seq_printf() calls into on= e call in show_cpuinfo() Applying: vfs: remove might_sleep() from clear_inode() Applying: mm/userfaultfd.c: remove duplicate include Applying: mm: remove unneeded kallsyms include Applying: hrtimer: remove unneeded kallsyms include Applying: genirq: remove unneeded kallsyms include Applying: mm/memblock: memblock_is_map/region_memory can be boolean Applying: lib/lockref: __lockref_is_dead can be boolean Applying: kernel/cpuset: current_cpuset_is_being_rebound can be boolean Applying: kernel/resource: iomem_is_exclusive can be boolean Applying: kernel/module: module_is_live can be boolean Applying: kernel/mutex: mutex_is_locked can be boolean Applying: crash_dump: is_kdump_kernel can be boolean Applying: certs/blacklist_nohashes.c: fix const confusion in certs blacklist Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer ove= rflow Applying: kasan: rework Kconfig settings Applying: sparc64: NG4 memset 32 bits overflow Applying: pipe, sysctl: drop 'min' parameter from pipe-max-size converter Applying: pipe, sysctl: remove pipe_proc_fn() Applying: pipe: actually allow root to exceed the pipe buffer limits Applying: pipe: fix off-by-one error when checking buffer limits Applying: pipe: reject F_SETPIPE_SZ with size over UINT_MAX Applying: pipe: simplify round_pipe_size() Applying: pipe: read buffer limits atomically Applying: mm: docs: fixup punctuation Applying: mm: docs: fix parameter names mismatch Applying: mm: docs: add blank lines to silence sphinx "Unexpected indentati= on" errors Applying: MAINTAINERS: remove ANDROID ION pattern Applying: MAINTAINERS: remove ARM/CLKDEV SUPPORT file pattern Applying: MAINTAINERS: update Cortina/Gemini patterns Applying: MAINTAINERS: update "ARM/OXNAS platform support" patterns Applying: maintainers-update-arm-oxnas-platform-support-patterns-fix Applying: MAINTAINERS: update various PALM patterns Applying: MAINTAINERS: update ARM/QUALCOMM SUPPORT patterns Merging akpm/master (c8cefc87ae4f MAINTAINERS: update ARM/QUALCOMM SUPPORT = patterns) --Sig_/.6g=uQsm/g==Lrn+6F7zCZw Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlp5IzsACgkQAVBC80lX 0Gw1pwf+I+seDBEn8XO9HRt65D4ulaK7q5zzL67yHYY+NpAvxiB21B5CcnX1QaVd wM7LVcvwBHP0osddjw/mhQHhXKaxgZuIMh/ofy3kTKKsIET127wit2smZkxzd0eE 9Df3SggD2fgYSTTvkeusOD8wMhXbFNwoGgCvny7gH2TXvSqWVE434VycvKVse25P 6PUYlJJulQp6lEYWVkkVhSDURiR0snTDc3xyEaOPbQWpeDOWtXa0c2Ak22UXLK4n y8KSw3EOLNo39A3W5AunebLrG/Q9fhQY+sGDbqdQhxVM/vTe1rSq13zcL48Lp511 3LyO88HmXQhgduMoqa2rAEsJtAwh6w== =JyxN -----END PGP SIGNATURE----- --Sig_/.6g=uQsm/g==Lrn+6F7zCZw--