Hi all, Please do not add any v4.20 material to your linux-next included branches until after v4.19-rc1 has been released. Changes since 20180813: Non-merge commits (relative to Linus' tree): 12053 10771 files changed, 512108 insertions(+), 210583 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 286 trees (counting Linus' and 65 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 (94710cac0ef4 Linux 4.18) Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging kbuild-current/fixes (9d3cce1e8b85 Linux 4.18-rc5) Merging arc-current/for-curr (7945121f56a2 ARC: [plat-axs*]: Enable SWAP) Merging arm-current/fixes (afc9f65e01cd ARM: 8781/1: Fix Thumb-2 syscall return for binutils 2.29+) Merging arm64-fixes/for-next/fixes (c7513c2a2714 crypto/arm64: aes-ce-gcm - add missing kernel_neon_begin/end pair) Merging m68k-current/for-linus (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6) Merging powerpc-fixes/fixes (cca19f0b684f powerpc/64s/radix: Fix missing global invalidations when removing copro) Merging sparc/master (c1d61e7fe376 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (ec0c96714e7d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging bpf/master (9c9542011739 Merge branch 'bpf-fix-cpu-and-devmap-teardown') Merging ipsec/master (25432eba9cd8 openvswitch: meter: Fix setting meter id for new entries) Merging netfilter/master (16e98cec49a4 ipvs: don't show negative times in ip_vs_conn) Merging ipvs/master (16e98cec49a4 ipvs: don't show negative times in ip_vs_conn) Merging wireless-drivers/master (299b6365a3b7 brcmfmac: fix regression in parsing NVRAM for multiple devices) Merging mac80211/master (e31f6456c01c cfg80211: never ignore user regulatory hint) Merging rdma-fixes/for-rc (addb8a6559f0 RDMA/uverbs: Expand primary and alt AV port checks) Merging sound-current/for-linus (f5b6c1fcb42f Merge tag 'asoc-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (6c0848398776 Merge branch 'asoc-4.18' into asoc-linus) Merging regmap-fixes/for-linus (1ffaddd029c8 Linux 4.18-rc8) Merging regulator-fixes/for-linus (a8afa92ec0d9 Merge branch 'regulator-4.18' into regulator-linus) Merging spi-fixes/for-linus (c3c7126248a0 Merge branch 'spi-4.18' into spi-linus) Merging pci-current/for-linus (44bda4b7d26e PCI: Fix is_added/is_busmaster race condition) Merging driver-core.current/driver-core-linus (acb1872577b3 Linux 4.18-rc7) Merging tty.current/tty-linus (021c91791a5e Linux 4.18-rc3) Merging usb.current/usb-linus (acb1872577b3 Linux 4.18-rc7) Merging usb-gadget-fixes/fixes (acb1872577b3 Linux 4.18-rc7) Merging usb-serial-fixes/usb-linus (9d3cce1e8b85 Linux 4.18-rc5) Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code) Merging phy/fixes (ad5003300b07 phy: mapphone-mdm6600: Fix wrong enum used for status lines) Merging staging.current/staging-linus (acb1872577b3 Linux 4.18-rc7) Merging char-misc.current/char-misc-linus (3d27c4de8d4f Revert "uio: use request_threaded_irq instead") Merging input-current/for-linus (ed9800100f1a MAINTAINERS: Add PhoenixRC Flight Controller Adapter) Merging crypto-current/master (877ccce7cbe8 crypto: x86/aegis,morus - Fix and simplify CPUID checks) Merging ide/master (a2eed33dcdb7 ide: mark expected switch fall-throughs) Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1) Merging kselftest-fixes/fixes (ce397d215ccd Linux 4.18-rc1) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (1e4b044d2251 Linux 4.18-rc4) Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1) Merging mtd-fixes/master (aa7eee8a143a mtd: spi-nor: cadence-quadspi: Fix direct mode write timeouts) Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) Merging mfd-fixes/for-mfd-fixes (ce397d215ccd Linux 4.18-rc1) Merging v4l-dvb-fixes/fixes (8eb0e6421958 media: v4l: vsp1: Fix deadlock in VSPDL DRM pipelines) Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) Merging mips-fixes/mips-fixes (d5ea019f8a38 Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum") Merging omap-fixes/fixes (d3f6daede246 ARM: dts: omap4-droid4: fix dts w.r.t. pwm) Merging kvm-fixes/master (63aff65573d7 kvm: x86: vmx: fix vpid leak) Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba) Merging hwmon-fixes/hwmon (1e4b044d2251 Linux 4.18-rc4) Merging nvdimm-fixes/libnvdimm-fixes (ee6581ceba7f nfit: fix unchecked dereference in acpi_nfit_ctl) Merging btrfs-fixes/next-fixes (0b7162742121 Merge branch 'for-next-current-v4.18-20180717' into next-fixes) Merging vfs-fixes/fixes (4c0d7cd5c841 make sure that __dentry_kill() always invalidates d_seq, unhashed or not) Merging dma-mapping-fixes/for-linus (7ec916f82c48 Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()") Merging drivers-x86-fixes/fixes (2502e5a02593 platform/x86: dell-laptop: Fix backlight detection) Merging samsung-krzk-fixes/fixes (ce397d215ccd Linux 4.18-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (ce397d215ccd Linux 4.18-rc1) Merging devicetree-fixes/dt/linus (b9952b5218ad of: overlay: update phandle cache on overlay apply and remove) Merging scsi-fixes/fixes (e95153b64d03 scsi: vmw_pvscsi: Return DID_RESET for status SAM_STAT_COMMAND_TERMINATED) Merging drm-fixes/drm-fixes (51973dc079a9 Merge tag 'drm-misc-fixes-2018-07-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (1ffaddd029c8 Linux 4.18-rc8) Merging mmc-fixes/fixes (3b1074bf9817 mmc: mxcmmc: Fix missing parentheses and brace) Merging rtc-fixes/rtc-fixes (fd6792bb022e rtc: fix alarm read and set offset) Merging drm-misc-fixes/for-linux-next-fixes (404fb5c9ef26 drm/vc4: Fix the "no scaling" case on multi-planar YUV formats) Merging kbuild/for-next (b8860d0727de Merge branches 'kbuild' and 'kconfig' into for-next) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) Merging dma-mapping/for-next (6fa1d28e38cf sh: use generic dma_noncoherent_ops) CONFLICT (content): Merge conflict in arch/nios2/Kconfig Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (6f6874f70c32 Merge branch 'clkdev' into for-next) Merging arm-perf/for-next/perf (809092dc3e60 drivers/perf: arm-ccn: Use devm_ioremap_resource() to map memory) Merging arm-soc/for-next (cd0a9070a96a arm-soc: Document merges) Merging actions/for-next (35afadd11222 Merge branch 'v4.19/drivers' into next) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) Merging amlogic/for-next (a1cec9f3baab Merge branch 'v4.19/dt64' into tmp/aml-rebuild) Merging aspeed/for-next (c224edaa4a46 Merge branches 'defconfig-for-v4.19' and 'dt-for-v4.19' into for-next) Merging at91/at91-next (f45853da06e3 Merge tag 'at91-ab-4.19-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) Merging bcm2835/for-next (5997adb14985 Merge branch anholt/bcm2835-defconfig-64-next into for-next) CONFLICT (content): Merge conflict in drivers/hwmon/Kconfig CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c Merging imx-mxs/for-next (7586f152bcad Merge branch 'imx/defconfig' into for-next) Merging keystone/next (ed3bf0f321b9 Merge branch 'for_4.19/drivers-soc' into next) Merging mediatek/for-next (b75253e66bc5 Merge branch 'v4.18-next/soc' into for-next) Merging mvebu/for-next (23b7c60b80f6 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (d356801075c5 Merge branch 'omap-for-v4.19/dt' into for-next) Merging reset/reset/next (d903779b58be reset: meson: add meson audio arb driver) Merging qcom/for-next (76b9e7f947f1 Merge tag 'qcom-defconfig-for-4.19' into all-for-4.19) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (7e58fb78c672 Merge branches 'fixes-for-v4.18', 'arm-defconfig-for-v4.19', 'arm-soc-for-v4.19', 'arm-dt-for-v4.19', 'arm64-defconfig-for-v4.19', 'arm64-dt-for-v4.19' and 'dt-bindings-for-v4.19' into next) Merging rockchip/for-next (efdcb339b730 Merge branch 'v4.19-clk/next' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (babb70ce9674 Merge branch 'next/soc' into for-next) Merging sunxi/sunxi/for-next (51c756fe7803 Merge branch 'sunxi/dt64-for-4.19' into sunxi/for-next) Merging tegra/for-next (f29cfb31cf00 Merge branch for-4.19/arm64/dt into for-next) Merging arm64/for-next/core (3c4d9137eefe arm64: alternative: Use true and false for boolean values) CONFLICT (content): Merge conflict in arch/arm64/Makefile Merging clk/clk-next (e60f551d4004 Merge branch 'clk-rockchip' into clk-next) Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata) Merging c6x/for-linux-next (31b02fe54206 c6x: switch to NO_BOOTMEM) Merging h8300/h8300-next (bb3a7c32b3a8 h8300: irqchip: fix warning) Merging m68k/for-next (71a896687b85 m68k/defconfig: Update defconfigs for v4.18-rc6) Merging m68knommu/for-next (58064e1f46b1 m68knommu: Fix typos in Coldfire 5272 DMA debug code) Merging microblaze/next (9fe37714c13c microblaze: delete wrong comment about machine_early_init) Merging mips/mips-next (4bcb4ad6634e MIPS: Consistently declare TLB functions) CONFLICT (content): Merge conflict in arch/mips/kernel/process.c CONFLICT (content): Merge conflict in arch/mips/Kconfig Merging nds32/next (fd4ba6228146 nds32: add NULL entry to the end of_device_id array) Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops) Merging parisc-hd/for-next (c8921d72e390 parisc: Fix and improve kernel stack unwinding) Merging powerpc/next (a2dc009afa9a powerpc/mm/book3s/radix: Add mapping statistics) CONFLICT (content): Merge conflict in arch/m68k/mac/misc.c Merging hvc/topic/hvc (9f65b81f36e3 tty: hvc: introduce the hv_ops.flush operation for hvc drivers) Merging fsl/next (bd96461249bd powerpc/dts/fsl: t2080rdb: use the Cortina PHY driver compatible) Merging risc-v/for-next (627672cf431b dt-bindings: interrupt-controller: SiFive Plaform Level Interrupt Controller) Merging s390/features (669f3765b755 s390/dasd: fix hanging offline processing due to canceled worker) Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) Merging uml/linux-next (5ec9121195a4 um: Fix raw interface options) Merging xtensa/xtensa-for-next (f0f84837c6da xtensa: rework noMMU cache attributes initialization) Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations) Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) Merging btrfs/next (29dcea88779c Linux 4.17) Merging btrfs-kdave/for-next (bba3fea4997e Merge branch 'for-next-next-v4.19-20180803' into for-next-20180803) Merging ceph/master (0fcf6c02b205 ceph: don't drop message if it contains more data than expected) Merging cifs/for-next (c4f7173ac3b7 smb3: create smb3 equivalent alias for cifs pseudo-xattrs) Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs) Merging ext3/for_next (6aee47d7f61e Pull in fsnotify cleanups from Amir and new inotify IN_MASK_CREATE flag support.) Merging ext4/dev (863c37fcb14f ext4: remove unneeded variable "err" in ext4_mb_release_inode_pa()) Merging f2fs/dev (a1614fd5c153 f2fs: fix performance issue observed with multi-thread sequential read) Merging fuse/for-next (963545357202 fuse: reduce allocation size for splice_write) Merging jfs/jfs-next (bd646104ac5a jfs: use time64_t for otime) Merging nfs/linux-next (94710cac0ef4 Linux 4.18) Merging nfs-anna/linux-next (62421cd94301 NFSv4: Fix a typo in nfs4_init_channel_attrs()) Merging nfsd/nfsd-next (a880da8c0901 NFSD stop ongoing async copies on client shutdown) Merging orangefs/for-next (f35cf2ab06b6 orangefs: remove redundant pointer orangefs_inode) Merging overlayfs/overlayfs-next (989974c80457 ovl: Enable metadata only feature) Merging ubifs/linux-next (f5a926dd5298 mtd: ubi: Update ubi-media.h to dual license) Merging v9fs/9p-next (edcd9d977354 net/9p/trans_virtio.c: add null terminal for mount tag) Merging xfs/for-next (01239d77b9dd xfs: fix a null pointer dereference in xfs_bmap_extents_to_btree) Merging file-locks/locks-next (da33a871ba17 locks: remove misleading obsolete comment) Merging vfs/for-next (4740b7833fc9 Merge branches 'work.dcache', 'work.misc', 'work.mkdir', 'work.lookup' and 'work.aio' into for-next) CONFLICT (content): Merge conflict in include/linux/fs.h Applying: vfs: samples: fix up for HOSTLOADLIBES rename Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging printk/for-next (a4322becd21e Merge branch 'for-4.19-nmi' into for-next) Merging pci/next (9e9ce130fca1 Merge branch 'remotes/lorenzo/pci/vmd') Merging pstore/for-next/pstore (1021bcf44d0e pstore: add zstd compression support) Merging hid/for-next (872d1282470b Merge branch 'for-4.19/intel-ish' into for-next) Merging i2c/i2c/for-next (3c0f4de9fd61 Merge branch 'i2c/for-current' into i2c/for-next) Merging dmi/master (7f73745fec52 firmware: dmi: Add access to the SKU ID string) Merging hwmon-staging/hwmon-next (4afec79f652b hwmon: (adt7475) Change show functions to return error data correctly) Merging jc_docs/docs-next (3d83d3188460 Documentation: corrections to console/console.txt) CONFLICT (content): Merge conflict in Documentation/index.rst Merging v4l-dvb/master (da2048b7348a Revert "media: vivid: shut up warnings due to a non-trivial logic") Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) Merging fbdev/fbdev-for-next (f39684524b39 Documentation/fb: corrections for fbcon.txt) Merging pm/linux-next (2c7e83a0c276 Merge branch 'acpi-x86' into linux-next) Merging cpupower/cpupower (1d83ddc13680 cpupower: change strncpy+truncation to strlcpy) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (c5c2a97b3ac7 PM / OPP: Update voltage in case freq == old_freq) Merging thermal/next (5043f06ecec6 MAINTAINERS: Add Daniel Lezcano as designated reviewer for thermal) Merging thermal-soc/next (542cdf406804 thermal: rcar_thermal: avoid NULL dereference in absence of IRQ resources) Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock) Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent) Merging rdma/for-next (61b717d041b1 RDMA/rxe: Set wqe->status correctly if an unexpected response is received) CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_main.c CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c Merging net-next/master (c371e7b438ca Merge tag 'mlx5e-updates-2018-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) CONFLICT (content): Merge conflict in net/smc/smc_ib.c CONFLICT (content): Merge conflict in net/smc/smc_core.c CONFLICT (content): Merge conflict in net/rds/ib_send.c CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_conn.c Merging bpf-next/master (2ce3206b9eb3 Merge branch 'bpf-ancestor-cgroup-id') Merging ipsec-next/master (ba7f4b3a3810 xfrm: Make function xfrmi_get_link_net() static) Merging mlx5-next/mlx5-next (664000b6bb43 net/mlx5: Add support for flow table destination number) Merging netfilter-next/master (78cbac647e61 Merge branch 'ip-faster-in-order-IP-fragments') Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) Merging ipvs-next/master (981467033a37 tc-testing: remove duplicate spaces in skbedit match patterns) Merging wireless-drivers-next/master (209b43759d65 ssb: Remove SSB_WARN_ON, SSB_BUG_ON and SSB_DEBUG) Merging bluetooth/master (42c625a486f3 net: sched: act_ife: disable bh when taking ife_mod_lock) Merging mac80211-next/master (133bf90dbb8b mac80211: restrict delayed tailroom needed decrement) Merging gfs2/for-next (f5580d0f8bf6 gfs2: eliminate update_rgrp_lvb_unlinked) Merging mtd/mtd/next (9805d4bcf8f9 mtd: rawnand: atmel: Select GENERIC_ALLOCATOR) Merging nand/nand/next (ed128e8b757b MAINTAINERS: drop Wenyou Yang from Atmel NAND driver support) Merging spi-nor/spi-nor/next (bb276262e88d mtd: spi-nor: only apply reset hacks to broken hardware) Merging crypto/master (22240df7ac6d crypto: arm64/ghash-ce - implement 4-way aggregation) CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fs_enet/mac-fec.c CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec_main.c Merging drm/drm-next (557ce95051c8 Merge branch 'drm-next-4.19' of git://people.freedesktop.org/~agd5f/linux into drm-next) Applying: drm/i915/kvmgt: merge fixup for "Check the pfn got from vfio_pin_pages" Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (3237c0dbe21f drm/i915/kvmgt: Fix compilation error) Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI) Merging drm-misc/for-linux-next (2ead1be54b22 drm/vkms: Fix connector leak at the module removal) Merging drm-msm/msm-next (546907de9952 drm/msm: a6xx: fix spelling mistake: "initalization" -> "initialization") Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (e368fc75c190 drm/arm/malidp: Added the late system pm functions) Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) Merging imx-drm/imx-drm/next (5c41bb607125 gpu: ipu-v3: add support for XRGB32 and XBGR32 V4L2 pixel formats) Merging etnaviv/etnaviv/next (5b1474655323 drm/etnaviv: fix crash in GPU suspend when init failed due to buffer placement) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (1dce5d849f94 Merge branch 'regmap-4.19' into regmap-next) Merging sound/for-next (f5b6c1fcb42f Merge tag 'asoc-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc/for-next (4aa5db22d355 Merge branch 'asoc-4.19' into asoc-next) Merging modules/modules-next (9be936f4b3a2 kernel/module: Use kmemdup to replace kmalloc+memcpy) Merging input/next (100294cee9a9 Input: do not use WARN() in input_alloc_absinfo()) Merging block/for-next (78e75902885f Merge branch 'for-4.19/post' into for-next) CONFLICT (content): Merge conflict in drivers/nvme/target/rdma.c Applying: nvme-dma: merge fix up for replacement of max_sge Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (bc9e9cf0401f dm crypt: don't decrease device limits) Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) Merging mmc/next (7f38abf220e2 mmc: core: improve reasonableness of bus width setting for HS400es) Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) Merging md/for-next (d63e2fc804c4 md/raid5: fix data corruption of replacements after originals dropped) Merging mfd/for-mfd-next (fe8166c92a5f mfd: sec-core: Export OF module alias table) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/Kconfig Merging backlight/for-backlight-next (633786736ed5 backlight: pwm_bl: Fix uninitialized variable) Merging battery/for-next (3d779180c692 power: supply: bq27xxx: Update comments) Merging regulator/for-next (d22d59362b7b Merge branch 'regulator-4.19' into regulator-next) Merging security/next-testing (d83c732fffc3 Merge branch 'smack-for-4.19-a' of https://github.com/cschaufler/next-smack into next-testing) Merging apparmor/apparmor-next (24b87a16fee0 apparmor: Fix failure to audit context info in build_change_hat) Merging integrity/next-integrity (3dd0f18c70d9 EVM: fix return value check in evm_write_xattrs()) Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) Merging selinux/next (7e4237faa721 selinux: cleanup dentry and inodes on error in selinuxfs) Merging tpmdd/next (ec403d8ed08c ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead) Merging watchdog/master (12aea518a202 watchdog: fix dependencies of menz69_wdt.o) Merging iommu/next (6488a7f35eea Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'arm/smmu', 'arm/omap', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (0dd0e297f0ec vfio-pci: Disable binding to PFs with SR-IOV enabled) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (baa2a4fdd525 audit: fix use-after-free in audit_add_watch) Merging devicetree/for-next (f11b9abc9318 Documentation: remove dynamic-resolution-notes reference to non-existent file) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/can/xilinx_can.txt Merging mailbox/mailbox-for-next (623a6143a845 mailbox: mediatek: Add Mediatek CMDQ driver) Merging spi/for-next (c1acb21b32a3 Merge branch 'spi-4.19' into spi-next) Merging tip/auto-latest (7b83d65d2aef Merge branch 'x86/pti' into auto-latest) CONFLICT (content): Merge conflict in drivers/infiniband/core/rdma_core.c CONFLICT (content): Merge conflict in arch/openrisc/Kconfig CONFLICT (content): Merge conflict in arch/arm64/Kconfig Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC) 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 (190bd6e98afc EDAC, sb_edac: Add support for systems with segmented PCI buses) Merging irqchip/irq/irqchip-next (f3b28362b683 irqchip/s3c24xx: Remove unneeded comparison of unsigned long to 0) Merging ftrace/for-next (f8a79d5c7ef4 tracepoints: Free early tracepoints after RCU is initialized) Merging rcu/rcu/next (d57fa29ddc3c Merge LKMM and RCU commits) CONFLICT (content): Merge conflict in kernel/sched/core.c Merging kvm/linux-next (fd8ca6dac9b4 KVM/x86: Use CC_SET()/CC_OUT in arch/x86/kvm/vmx.c) CONFLICT (content): Merge conflict in arch/x86/include/asm/trace/hyperv.h Applying: kvm: x86: fix semantic conflict in platform init Merging kvm-arm/next (976d34e2dab1 KVM: arm/arm64: Skip updating PTE entry if no change) CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpucaps.h Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (b5c6f7607b90 KVM: PPC: Book3S HV: Read kvm->arch.emul_smt_mode under kvm->lock) Merging kvms390/next (237584619366 Merge tag 'hlp_stage1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvms390/next) Merging xen-tip/linux-next (3596924a233e xen/balloon: fix balloon initialization for PVH Dom0) Applying: xen/gntdev: fix up for attach callback API change Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) Merging workqueues/for-next (66448bc274ca workqueue: move function definitions within CONFIG_SMP block) Merging drivers-x86/for-next (0b4e30f49aa4 platform/x86: mlx-platform: Remove unused define) Merging chrome-platform/for-next (40291fb75123 Merge tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19) Merging hsi/for-next (ce397d215ccd Linux 4.18-rc1) Merging leds/for-next (2224f2ff9670 leds: ns2: Change unsigned to unsigned int) Merging ipmi/for-next (a4fb7ddc6356 ipmi: kcs_bmc: don't change device name) Merging driver-core/driver-core-next (d2fc88a61b4e Merge 4.18-rc7 into driver-core-next) CONFLICT (content): Merge conflict in fs/sysfs/group.c CONFLICT (content): Merge conflict in drivers/iommu/ipmmu-vmsa.c Merging usb/usb-next (29c692c96b3a USB: serial: pl2303: add a new device id for ATEN) Merging usb-gadget/next (4ea438da76f4 usb: dwc3: gadget: Check MaxPacketSize from descriptor) Merging usb-serial/usb-next (c8acfe0aadbe USB: serial: cp210x: implement GPIO support for CP2102N) Merging usb-chipidea-next/ci-for-usb-next (ba0ab35a81de usb: chipidea: tegra: Use aligned DMA on Tegra114/124) Merging phy-next/next (ec14b83a1ee4 phy: mvebu-cp110-comphy: switch to SPDX identifier) Merging tty/tty-next (47ac76662ca9 tty: serial: 8250: Revert NXP SC16C2552 workaround) Merging char-misc/char-misc-next (128f38041035 android: binder: Rate-limit debug and userspace triggered err msgs) CONFLICT (content): Merge conflict in MAINTAINERS Merging extcon/extcon-next (838588289b76 extcon: maxim: Add SPDX license identifiers) Merging staging/staging-next (e4f6a44c4aec staging:rtl8192u: Remove unused macro definitions - Style) CONFLICT (modify/delete): drivers/staging/skein/skein_generic.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/skein/skein_generic.c left in tree. CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/pressure/bmp085.txt $ git rm -f drivers/staging/skein/skein_generic.c Merging mux/for-next (2c01260df661 mux: add mux_control_get_optional() API) Merging slave-dma/next (39245da8313d Merge branch 'topic/owl' into next) Merging cgroup/for-next (e4f8d81c738d cgroup/tracing: Move taking of spin lock out of trace event handlers) Merging scsi/for-next (714d7fe777fc Merge branch 'misc' into for-next) CONFLICT (modify/delete): lib/percpu_ida.c deleted in scsi/for-next and modified in HEAD. Version HEAD of lib/percpu_ida.c left in tree. CONFLICT (content): Merge conflict in MAINTAINERS $ git rm -f lib/percpu_ida.c Merging scsi-mkp/for-next (51372570ac3c scsi: core: use blk_mq_run_hw_queues in scsi_kick_queue) Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) Merging libata/for-next (cc28cd5c6181 Merge branch 'for-4.19' into for-next) Merging vhost/linux-next (89da619bc18d virtio_balloon: fix another race between migration and ballooning) Merging rpmsg/for-next (9a115e2f18d9 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (a5ec96ddfd55 gpio: it87: Add support for IT8613) Merging pinctrl/for-next (c2944a9a09a2 pinctrl: nomadik: silence uninitialized variable warning) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt Merging pinctrl-samsung/for-next (b3793159249b dt-bindings: pinctrl: samsung: Add SPDX license identifier) Merging pwm/for-next (19ad2b75c643 pwm: mxs: Switch to SPDX identifier) Merging userns/for-next (c3ad2c3b02e9 signal: Don't restart fork when signals come in.) Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) Merging random/dev (9a47249d444d random: Make crng state queryable) Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) Merging kselftest/next (01675e9503c4 selftests/ftrace: Fix kprobe string testcase to not probe notrace function) Merging y2038/y2038 (e264abeaf9da pstore: Remove bogus format string definition) Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next) Merging coresight/next (a154bd6aec53 coresight: etm-perf: Add support for ETR backend) Merging rtc/rtc-next (5a5ba10f44fa rtc: remove struct rtc_task) Merging nvdimm/libnvdimm-for-next (9103365c3acd libnvdimm: fix ars_status output length calculation) CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c Merging at24/at24/for-next (a2b3bf4846e5 eeprom: at24: Add support for address-width property) Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch) Merging kspp/for-next/kspp (8e4ec2134312 Merge branch 'vla/leftovers' into for-next/kspp) CONFLICT (content): Merge conflict in arch/Kconfig Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging cisco/for-next (ce397d215ccd Linux 4.18-rc1) Merging xarray/xarray (8d7cf3e16ed4 radix tree: Remove radix_tree_clear_tags) CONFLICT (content): Merge conflict in fs/dax.c CONFLICT (content): Merge conflict in MAINTAINERS Merging fsi/master (15e2a7218c27 fsi: sbefifo: Bump max command length) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging ida/ida (e204222244f0 ida: Convert to XArray) Merging akpm-current/current (f900cbae36e9 ipc/util.c: update return value of ipc_getref from int to bool) CONFLICT (content): Merge conflict in lib/Kconfig.debug CONFLICT (content): Merge conflict in kernel/fork.c CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in include/linux/bitops.h CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (content): Merge conflict in drivers/xen/gntdev.c CONFLICT (content): Merge conflict in drivers/md/bcache/util.h CONFLICT (content): Merge conflict in drivers/md/bcache/Kconfig CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile CONFLICT (content): Merge conflict in Documentation/filesystems/proc.txt Applying: fixup for bit.h/bitops.h merge Applying: merge fix up for "signal: Pass pid type into group_send_sig_info" $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t Applying: fs/afs: use new return type vm_fault_t Applying: treewide: correct "differenciate" and "instanciate" typos Applying: fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds Applying: mm/util: make strndup_user description a kernel-doc comment Applying: mm/util: add kernel-doc for kvfree Applying: docs/core-api: kill trailing whitespace in kernel-api.rst Applying: docs/core-api: move *{str,mem}dup* to "String Manipulation" Applying: docs/core-api: split memory management API to a separate file Applying: docs/mm: make GFP flags descriptions usable as kernel-doc Applying: docs/core-api: mm-api: add section about GFP flags Applying: drivers/gpu/drm/gma500/: change return type to vm_fault_t Applying: treewide: convert ISO_8859-1 text comments to utf-8 Applying: s390: ebcdic: convert comments to UTF-8 Applying: lib/fonts: convert comments to utf-8 Applying: mm: Change return type int to vm_fault_t for fault handlers Applying: mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix Applying: resource: merge resources on a node when hot-adding memory Applying: resource-merge-resources-on-a-node-when-hot-adding-memory-fix Applying: vfs: replace current_kernel_time64 with ktime equivalent Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Merging akpm/master (0c19a2b6b955 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgpC1rbXynFNG.pgp
Description: OpenPGP digital signature
