Hi all, Changes since 20181003: The bpf-next tree still had its build failure so I used the version from next-20181002. The kvm-arm tree gained conflicts against the arm64 tree. The tty tree gained a build failure so I used the version from next-20181003. The slave-dma tree gained a build failure so I used the version from next-20181003. The userns tree gained a conflict against the y2038 tree. Non-merge commits (relative to Linus' tree): 8120 7864 files changed, 365604 insertions(+), 168933 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 290 trees (counting Linus' and 66 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 (95773dc08627 Merge tag 'linux-kselftest-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging fixes/master (72358c0b59b7 linux-next: build warnings from the build of Linus' tree) Merging kbuild-current/fixes (ef8c4ed9db80 kbuild: allow to use GCC toolchain not in Clang search path) Merging arc-current/for-curr (40660f1fcee8 ARC: build: Don't set CROSS_COMPILE in arch's Makefile) Merging arm-current/fixes (3a58ac65e2d7 ARM: 8799/1: mm: fix pci_ioremap_io() offset check) Merging arm64-fixes/for-next/fixes (2a3f93459d68 arm64: KVM: Sanitize PSTATE.M when being set from userspace) Merging m68k-current/for-linus (0986b16ab49b m68k/mac: Use correct PMU response format) Merging powerpc-fixes/fixes (7e0cf1c983b5 selftests/powerpc: Fix Makefiles for headers_install change) Merging sparc/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (4233cfe6ec46 ixgbe: check return value of napi_complete_done()) Merging bpf/master (b0584ea66d73 bpf: don't accept cgroup local storage with zero value size) Merging ipsec/master (4da402597c2b xfrm: fix gro_cells leak when remove virtual xfrm interfaces) Merging netfilter/master (1ad98e9d1bdf tcp/dccp: fix lockdep issue when SYN is backlogged) Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging wireless-drivers/master (3baafeffa48a iwlwifi: 1000: set the TFD queue size) Merging mac80211/master (848e616e66d4 cfg80211: fix wext-compat memory leak) Merging rdma-fixes/for-rc (5c5702e259dc RDMA/core: Set right entry state before releasing reference) Merging sound-current/for-linus (b3a5402cbceb ALSA: hda: Fix the audio-component completion timeout) Merging sound-asoc-fixes/for-linus (6f450574b28f Merge branch 'asoc-4.19' into asoc-linus) Merging regmap-fixes/for-linus (7876320f8880 Linux 4.19-rc4) Merging regulator-fixes/for-linus (17b57b1883c1 Linux 4.19-rc6) Merging spi-fixes/for-linus (17b57b1883c1 Linux 4.19-rc6) Merging pci-current/for-linus (95375f2ab296 PCI: mvebu: Fix PCI I/O mapping creation sequence) Merging driver-core.current/driver-core-linus (7876320f8880 Linux 4.19-rc4) Merging tty.current/tty-linus (5b162cc4ac27 Revert "serial: sh-sci: Allow for compressed SCIF address") Merging usb.current/usb-linus (555df5820e73 usb: xhci-mtk: resume USB3 roothub first) Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of dwc2_check_core_endianness) Merging usb-serial-fixes/usb-linus (f5fad711c06e USB: serial: simple: add Motorola Tetra MTP6550 id) Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code) Merging phy/fixes (5b394b2ddf03 Linux 4.19-rc1) Merging staging.current/staging-linus (7876320f8880 Linux 4.19-rc4) Merging char-misc.current/char-misc-linus (eafa717bc145 thunderbolt: Initialize after IOMMUs) Merging soundwire-fixes/fixes (8d6ccf5cebbc soundwire: Fix acquiring bus lock twice during master release) Merging input-current/for-linus (4fef1250eafd Input: uinput - allow for max == min during input_absinfo validation) Merging crypto-current/master (ba439a6cbfa2 crypto: qat - Fix KASAN stack-out-of-bounds bug in adf_probe()) Merging ide/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1) Merging kselftest-fixes/fixes (ce01a1575f45 rseq/selftests: fix parametrized test with -fpie) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (111b009f7e8b dmaengine: mic_x100_dma: use devm_kzalloc to fix an issue) Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1) Merging mtd-fixes/master (6bf4ca7fbc85 Linux 4.19-rc5) 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 (10492ee8ed91 mfd: omap-usb-host: Fix dts probe of children) Merging v4l-dvb-fixes/fixes (ad608fbcf166 media: v4l: event: Prevent freeing event subscriptions while accessed) Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) Merging mips-fixes/mips-fixes (e7e86f42fa68 MAINTAINERS: MIPS/LOONGSON2 ARCHITECTURE - Use the normal wildcard style) Merging at91-fixes/at91-fixes (379e36d3f591 ARM: dts: at91: sama5d2_ptc_ek: fix nand pinctrl) Merging omap-fixes/fixes (c265c0ca76fb ARM: dts: logicpd-som-lv: Fix OMAP35/DM37 Compatibility issues) Merging kvm-fixes/master (26b471c7e2f7 KVM: nVMX: Fix bad cleanup on error of get/set nested state IOCTLs) Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs) Merging hwmon-fixes/hwmon (234b69e3e089 ocfs2: fix ocfs2 read block panic) Merging nvdimm-fixes/libnvdimm-fixes (f52afc93cd01 dax: Fix deadlock in dax_lock_mapping_entry()) Merging btrfs-fixes/next-fixes (675c168b2b92 Merge branch 'misc-4.19' into next-fixes) Merging vfs-fixes/fixes (ffc4c92227db sysfs: Do not return POSIX ACL xattrs via listxattr) Merging dma-mapping-fixes/for-linus (46bbeb69ff2f dma-mapping: add the missing ARCH_HAS_SYNC_DMA_FOR_CPU_ALL declaration) Merging drivers-x86-fixes/fixes (6bf4ca7fbc85 Linux 4.19-rc5) Merging samsung-krzk-fixes/fixes (5b394b2ddf03 Linux 4.19-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (5b394b2ddf03 Linux 4.19-rc1) Merging devicetree-fixes/dt/linus (e54192b48da7 of: fix phandle cache creation for DTs with no phandles) Merging scsi-fixes/fixes (3cc5746e5ad7 scsi: qedi: Initialize the stats mutex lock) Merging drm-fixes/drm-fixes (77d981b16f2d Merge tag 'exynos-drm-fixes-for-v4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (4c9613ce556f drm/i915: Handle incomplete Z_FINISH for compressed error states) Merging mmc-fixes/fixes (1b09d9c232cd mmc: slot-gpio: Fix debounce time to use miliseconds again) Merging rtc-fixes/rtc-fixes (5b394b2ddf03 Linux 4.19-rc1) Merging drm-misc-fixes/for-linux-next-fixes (4d4c2d89913e drm/cma-helper: Fix crash in fbdev error path) Merging kbuild/for-next (7163c4dce053 Merge branch 'kbuild' 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 (6db37ad7c27b dma-mapping: move dma_default_get_required_mask under ifdef) CONFLICT (content): Merge conflict in kernel/dma/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 (db2add336999 Merge branches 'fixes', 'misc' and 'spectre' into for-next) Merging arm-perf/for-next/perf (5b394b2ddf03 Linux 4.19-rc1) Merging arm-soc/for-next (56fc7d009444 arm-soc: document merges) Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) Merging amlogic/for-next (90133eb56b76 Merge branch 'v4.20/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (3368e06e2a91 ARM: dts: aspeed: Adding Facebook TiogaPass BMC) Merging at91/at91-next (128f53d05feb Merge branches 'at91-drivers', 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) Merging bcm2835/for-next (ca5b45b7c5cd Merge branch 'bcm2835-defconfig-next' into for-next) Merging imx-mxs/for-next (8bcab2453884 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next) Merging mediatek/for-next (42ac5fee3a13 Merge branch 'v4.19-next/soc' into for-next) Merging mvebu/for-next (280783e71125 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (b161216b621f Merge branch 'omap-for-v4.20/ti-sysc-take2' into for-next) Merging reset/reset/next (d903779b58be reset: meson: add meson audio arb driver) Merging qcom/for-next (6252f3298861 Merge tag 'qcom-arm64-defconfig-for-4.20' into 4.20-tagged) Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) Merging renesas/next (2586035c01f6 Merge branches 'arm-defconfig-for-v4.20', 'arm-dt-for-v4.20', 'arm-soc-for-v4.20', 'arm64-dt-for-v4.20' and 'drivers-for-v4.20' into next) Merging rockchip/for-next (276647f89f9c Merge branch 'v4.20-armsoc/defconfig64' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (b9acde832ba8 Merge branch 'next/soc' into for-next) Merging sunxi/sunxi/for-next (25c5fc5a4923 Merge branch 'sunxi/h3-h5-for-4.20' into sunxi/for-next) CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3.dtsi Merging tegra/for-next (22fed951fe3b Merge branch for-4.20/arm64/dt into for-next) Merging arm64/for-next/core (c219bc4e9205 arm64: Trap WFI executed in userspace) Merging clk/clk-next (488cd4a6db84 Merge branch 'clk-k3-tisci' into clk-next) Merging clk-samsung/for-next (0cd70a1f69af clk: samsung: Use clk_hw API for calling clk framework from clk notifiers) Merging c6x/for-linux-next (929ba9300082 c6x: switch to NO_BOOTMEM) Merging csky/linux-next (c4b17dd4a3cc csky: remove NSIGXXX in abiv2/fpu.c) Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no) Merging ia64/next (02b4da5f84d1 intel-iommu: mark intel_dma_ops static) Merging m68k/for-next (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode) Merging m68knommu/for-next (da56cb950fb6 m68k: fix command-line parsing when passed from u-boot) Merging microblaze/next (c4347b05440f microblaze/PCI: Remove stale pcibios_align_resource() comment) Merging mips/mips-next (2f0b649b3b4a MIPS: stop using _PTRS_PER_PGD) Merging nds32/next (3350139c0ff3 nds32: linker script: GCOV kernel may refers data in __exit) Merging nios2/for-next (c7c09dc187f0 nios2: kconfig: remove duplicate DEBUG_STACK_USAGE symbol defintions) Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops) Merging parisc-hd/for-next (2c18d35d677d parisc: Remove PTE load and fault check from L2_ptep macro) Merging powerpc/next (0823c68b054b powerpc/fadump: re-register firmware-assisted dump if already registered) 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 (17b57b1883c1 Linux 4.19-rc6) Merging s390/features (ccc413f62143 s390/qdio: clean up AOB handling) 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 (d9cbd0e8f667 um: NULL check before kfree is not needed) Merging xtensa/xtensa-for-next (c9efd0d7beb3 Merge branch 'xtensa-fixes' into xtensa-for-next) 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 (89067b62df5b Merge branch 'for-next-next-v4.20-20180914' into for-next-20180914) Merging ceph/master (e92c0eaf7543 rbd: support cloning across namespaces) Merging cifs/for-next (7af929d6d05b smb3: fix lease break problem introduced by compounding) 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 (12f0d3d810c0 Merge fanotify support for reporting PID instead of TGID.) Merging ext4/dev (cce6c9f7e602 ext4, dax: set ext4_dax_aops for dax files) Merging f2fs/dev (eaea083fa7c0 f2fs: submit cached bio to avoid endless PageWriteback) Merging fuse/for-next (e52a8250480a fuse: realloc page array) Merging jfs/jfs-next (1390643d1d5c jfs: remove redundant dquot_initialize() in jfs_evict_inode()) Merging nfs/linux-next (c7944ebb9ce9 NFSv4: Fix lookup revalidate of regular files) Merging nfs-anna/linux-next (9f0c5124f4a8 NFS: Don't open code clearing of delegation state) Merging nfsd/nfsd-next (7d20b6a2728f nfsd: remove set but not used variable 'dirp') Merging orangefs/for-next (a3bb1b184669 Orangefs: some error code paths missed kmem_cache_free to bad effect.) Merging overlayfs/overlayfs-next (69383c5913a5 ovl: make symbol 'ovl_aops' static) Merging ubifs/linux-next (f061c1cc404a Revert "ubifs: xattr: Don't operate on deleted inodes") Merging v9fs/9p-next (76b600d46911 9p: potential NULL dereference) Merging xfs/for-next (e55ec4ddbef9 xfs: fix error handling in xfs_bmap_extents_to_btree) Merging file-locks/locks-next (10f3e23f07cb Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging vfs/for-next (f022b08a0a9b Merge branches 'work.mount', 'work.alpha' and 'work.compat' into for-next) CONFLICT (content): Merge conflict in fs/f2fs/super.c Applying: f2fs: update for MS_* flags mostly going away Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) Merging printk/for-next (a6ae928c2583 Revert "printk: make sure to print log on console.") Merging pci/next (1837afcfc0d5 Merge branch 'remotes/lorenzo/pci/mediatek') Merging pstore/for-next/pstore (bac6f6cda206 pstore/ram: Fix failure-path memory leak in ramoops_init) Merging hid/for-next (53562f204ac3 Merge branch 'for-4.20/apple' into for-next) Merging i2c/i2c/for-next (210932079eb9 Merge branch 'i2c/for-4.20' into i2c/for-next) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (a3fa12e10ce1 hwmon: (ina3221) mark PM functions as __maybe_unused) Merging jc_docs/docs-next (ff348763775e doc: Fix acronym "FEKEK" in ecryptfs) Merging v4l-dvb/master (5f108da55c6a media: smiapp: Remove unused loop) Merging v4l-dvb-next/master (357b50f3ccc8 drm: amd: dc: don't use FP math when Kcov is enabled) Merging fbdev/fbdev-for-next (7c968791f775 video/fbdev/stifb: Fix spelling mistake in fall-through annotation) Merging pm/linux-next (95ab5147a798 Merge branches 'pm-opp' and 'pm-devfreq' into linux-next) Merging cpupower/cpupower (8a7e2d2ea080 cpupower: remove stringop-truncation waring) Merging idle/next (8a5776a5f498 Linux 4.14-rc4) Merging opp/opp/linux-next (5ed4cecd75e9 OPP: Pass OPP table to _of_add_opp_table_v{1|2}()) Merging thermal/next (d7a4303b8d1f dt-bindings: thermal: Allow multiple devices to share cooling map) Merging thermal-soc/next (152395fd03d4 thermal: of-thermal: disable passive polling when thermal zone is disabled) 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 (41ab1cb7d1cd RDMA/cma: Introduce and use cma_ib_acquire_dev()) CONFLICT (content): Merge conflict in drivers/infiniband/core/cache.c Merging net-next/master (7bdaae270cb5 Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) CONFLICT (content): Merge conflict in net/core/rtnetlink.c CONFLICT (modify/delete): Documentation/networking/00-INDEX deleted in HEAD and modified in net-next/master. Version net-next/master of Documentation/networking/00-INDEX left in tree. $ git rm -f Documentation/networking/00-INDEX Merging bpf-next/master (33d9a7fd6756 Merge branch 'bpf-sk-lookup') $ git reset --hard HEAD^ Merging next-20181002 version of bpf-next Merging ipsec-next/master (6140cc20caf7 Merge branch 'Support-of-Flow-Director-in-HNS3-Ethernet-Driver-for-HiP08-Rev2-SoC') Merging mlx5-next/mlx5-next (bd37197554eb net/mlx5: Update mlx5_ifc with DEVX UID bits) Merging netfilter-next/master (e9837e55b020 netfilter: xt_quota: fix the behavior of xt_quota module) Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT") Merging wireless-drivers-next/master (4e6d47206c32 tls: Add support for inplace records encryption) Merging bluetooth/master (3c89f1404396 Bluetooth: btsdio: Do not bind to non-removable BCM43430) Merging mac80211-next/master (5207ca554bfc cfg80211: sort tracing properly) Merging gfs2/for-next (4f36cb36c9d1 gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated) Merging mtd/mtd/next (5b394b2ddf03 Linux 4.19-rc1) Merging nand/nand/next (40667c037a3d mtd: rawnand: Allow selection of ECC byte ordering at runtime) Merging spi-nor/spi-nor/next (496c415717b8 mtd: spi-nor: fsl-quadspi: Don't let -EINVAL on the bus) Merging crypto/master (79517e8f8e6d crypto: cavium - remove redundant null pointer check before kfree) Merging drm/drm-next (c530174b90fa Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next) Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) Merging drm-intel/for-linux-next (98a9bce38b3d drm/i915: Avoid compiler warning for maybe unused gu_misc_iir) Merging drm-tegra/drm/tegra/for-next (5ac93f81096a drm/tegra: Detach devices from IOMMU DMA domain on arm32) Merging drm-misc/for-linux-next (4be9bd10e22d drm/fb_helper: Allow leaking fbdev smem_start) Merging drm-msm/msm-next (bdacdcf20bb5 drm/msm/a6xx: Add inactive_period for a6xx) Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (3dae1c0919d8 drm/arm/malidp: Implemented the size validation for AFBC framebuffers) 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 (1a866306e0fb drm/etnaviv: add DMA configuration for etnaviv platform device) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (fadf3e019411 Merge remote-tracking branch 'regmap/topic/single-rw' into regmap-next) Merging sound/for-next (2e75b676c328 ALSA: intel8x0: Fix fall-through annotations) Merging sound-asoc/for-next (dce5c4639f31 Merge branch 'asoc-4.20' into asoc-next) Merging modules/modules-next (9be936f4b3a2 kernel/module: Use kmemdup to replace kmalloc+memcpy) Merging input/next (d2587800598c Input: atmel_mxt_ts - fix multiple <linux/property.h> includes) Merging block/for-next (624d3b505d02 Merge branch 'for-4.20/block' into for-next) Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) Merging device-mapper/for-next (cd3085739323 dm cache: fix resize crash if user doesn't reload cache table) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (a1d467600ca6 Merge branch 'fixes' into next) Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) Merging md/for-next (059421e041eb md: allow metadata updates while suspending an array - fix) Merging mfd/for-mfd-next (92d6ba4ff700 mfd: ti-lmu: constify mfd_cell tables) Merging backlight/for-backlight-next (633786736ed5 backlight: pwm_bl: Fix uninitialized variable) Merging battery/for-next (a4ac1f5ced58 power: reset: qcom-pon: Add pms405 pon support) Merging regulator/for-next (0258e6c5d3dd Merge remote-tracking branches 'regulator/topic/bd718xx' and 'regulator/topic/pfuze100' into regulator-next) Merging security/next-testing (ad33b870a66b Merge branch 'next-general' into next-testing) Merging apparmor/apparmor-next (250f2da49cb8 apparmor: Fix uninitialized value in aa_split_fqname) 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 (4458bba09788 selinux: Add __GFP_NOWARN to allocation at str_read()) Merging tpmdd/next (8abac8d7b90d tpm: Restore functionality to xen vtpm driver.) Merging watchdog/master (d72e8256c209 dt-bindings: watchdog: renesas-wdt: Add support for R7S9210) Merging iommu/next (6eb628e57e51 Merge branches 'arm/renesas', 'arm/smmu', 'ppc/pamu', 'x86/vt-d' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (cf3f98c7f466 drivers/vfio: Allow type-1 IOMMU instantiation with all ARM/ARM64 IOMMUs) CONFLICT (content): Merge conflict in drivers/vfio/Kconfig Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (57361846b52b Linux 4.19-rc2) Merging devicetree/for-next (898c452a4144 Merge branch 'all-dtbs' into dt/next) CONFLICT (content): Merge conflict in drivers/soc/qcom/apr.c CONFLICT (content): Merge conflict in arch/c6x/kernel/setup.c Merging mailbox/mailbox-for-next (9f0a0a381c5d mailbox: mediatek: Add check for possible failure of kzalloc) Merging spi/for-next (3ef9c6417f4d Merge remote-tracking branch 'spi/topic/of' into spi-next) Merging tip/auto-latest (3b78dbfb8fbe Merge branch 'x86/urgent') 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 (432de7fd7630 EDAC, {i7core,sb,skx}_edac: Fix uncorrected error counting) Merging irqchip/irq/irqchip-next (2130b789b3ef irqchip/gic: Unify GIC priority definitions) Merging ftrace/for-next (5a5e3d3ceae2 perf probe: Support SDT markers having reference counter (semaphore)) Merging rcu/rcu/next (0b1aba265b93 Merge LKMM and RCU branches) Merging kvm/linux-next (5b394b2ddf03 Linux 4.19-rc1) Merging kvm-arm/next (fd2ef358282c KVM: arm/arm64: Ensure only THP is candidate for adjustment) CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_mmu.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_arm.h CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_mmu.h Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) Merging kvm-ppc/kvm-ppc-next (46dec40fb741 KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function) Merging kvms390/next (55d09dd4c860 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext) Merging xen-tip/linux-next (811e0345cfc1 xen/balloon: Grammar s/Is it/It is/) Merging percpu/for-next (b5bb42587118 arm64: percpu: Initialize ret in the default case) Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing) Merging drivers-x86/for-next (5aa389aa29ce MAINTAINERS: intel_pmc_core: Update MAINTAINERS) 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 (5b394b2ddf03 Linux 4.19-rc1) Merging leds/for-next (2d00f35c55e7 leds: add Panasonic AN30259A support) Merging ipmi/for-next (10042504ed92 ipmi:ssif: Add support for multi-part transmit messages > 2 parts) Merging driver-core/driver-core-next (a75e78f21f9a kernfs: Fix range checks in kernfs_get_target_path) Merging usb/usb-next (3c168909002e usb: gadget: fix spelling mistakeis "[En]queing" -> "[En]queuing") Merging usb-gadget/next (5b394b2ddf03 Linux 4.19-rc1) Merging usb-serial/usb-next (ba93cc7da896 USB: serial: ftdi_sio: implement GPIO support for FT-X devices) Merging usb-chipidea-next/ci-for-usb-next (35a334659bcc usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match) Merging phy-next/next (566b388440bb phy: renesas: convert to SPDX identifiers) Merging tty/tty-next (aad2d4952d24 serial: 8250_uniphier: add auto-flow-control support) $ git reset --hard HEAD^ Merging next-20181003 version of tty Merging char-misc/char-misc-next (8f523d6db7ed VMCI: remove set but not used variable 'cid') Merging extcon/extcon-next (2e464ff0a9b1 extcon: int3496: Convert to use SPDX identifier) Merging soundwire/next (502c00d9c315 Documentation: soundwire: fix stream.rst markup warnings) Merging staging/staging-next (0f912f9de117 staging: rtl8188eu: fix spelling mistake in comment) CONFLICT (content): Merge conflict in MAINTAINERS CONFLICT (modify/delete): Documentation/filesystems/00-INDEX deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of Documentation/filesystems/00-INDEX left in tree. $ git rm -f Documentation/filesystems/00-INDEX Merging mux/for-next (2c01260df661 mux: add mux_control_get_optional() API) Merging icc/icc-next (8f023d0cb757 interconnect: core: Fix unused variable compiler warning) Merging slave-dma/next (101d256a45ed Merge branch 'testing/dirn_remove' into next) $ git reset --hard HEAD^ Merging next-20181003 version of slave-dma Merging cgroup/for-next (808c43b7c7f7 cgroup: Simplify cgroup_ancestor) Merging scsi/for-next (257f0d4d404c Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (ef801f07e7b3 scsi: qla2xxx: Return switch command on a timeout) 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 vhost/linux-next (1e05b62ae4bd sh: use the the PCI channels's io_map_base) Merging rpmsg/for-next (7971e3e2e85c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (3881364c362f Merge branch 'devel' into for-next) Merging pinctrl/for-next (de0c18a87cfa pinctrl: msm: Actually use function 0 for gpio selection) Merging pinctrl-samsung/for-next (5b394b2ddf03 Linux 4.19-rc1) Merging pwm/for-next (8cdc43afbb2c pwm: mediatek: Add MT7628 support) Merging userns/for-next (4ce5f9c9e754 signal: Use a smaller struct siginfo in the kernel) CONFLICT (content): Merge conflict in kernel/signal.c CONFLICT (content): Merge conflict in arch/x86/kernel/traps.c CONFLICT (content): Merge conflict in arch/arm64/kernel/traps.c Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) Merging random/dev (9b25436662d5 random: make CPU trust a boot parameter) Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) Merging kselftest/next (b76c2bbcb049 selftests: watchdog: Fix ioctl SET* error paths to take oneshot exit path) Merging y2038/y2038 (67314ec7b025 RISC-V: Request newstat syscalls) Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next) Merging coresight/next (29c222d1a9f5 Merge 4.19-rc6) Merging rtc/rtc-next (959e8b77bf92 rtc: mv: let the core handle invalid alarms) Merging nvdimm/libnvdimm-for-next (be5ba2ca053d dax: Fix use of zero page) Merging at24/at24/for-next (9a9e295e7c5c eeprom: at24: fix unexpected timeout under high load) Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch) Merging kspp/for-next/kspp (329d8c84391b Merge branch 'for-next/vla' into for-next/kspp) CONFLICT (content): Merge conflict in drivers/misc/lkdtm/core.c Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging cisco/for-next (ff6401301656 Merge branch 'for-powerpc' into for-next) CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c Merging fsi/master (15e2a7218c27 fsi: sbefifo: Bump max command length) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging xarray/xarray (f176eda90aeb radix tree: Remove multiorder support) CONFLICT (content): Merge conflict in fs/f2fs/data.c CONFLICT (content): Merge conflict in fs/dax.c Merging akpm-current/current (bf11f926d760 lib/lz4: update LZ4 decompressor module) CONFLICT (content): Merge conflict in mm/workingset.c CONFLICT (content): Merge conflict in mm/swap_state.c CONFLICT (content): Merge conflict in kernel/memremap.c CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in block/blk-iolatency.c CONFLICT (content): Merge conflict in arch/hexagon/Kconfig CONFLICT (content): Merge conflict in arch/arm64/Kconfig $ git checkout -b akpm remotes/origin/akpm/master Applying: percpu: remove PER_CPU_DEF_ATTRIBUTES macro Applying: mm: remove CONFIG_NO_BOOTMEM Applying: mm: remove now defunct NO_BOOTMEM from depends list for deferred init Applying: mm: remove CONFIG_HAVE_MEMBLOCK Applying: of/fdt: fixup #ifdefs after removal of HAVE_MEMBLOCK config option Applying: csky: fixups after bootmem removal Applying: memblock: remove stale #else and the code it protects Applying: mm: remove bootmem allocator implementation. Applying: mm: nobootmem: remove dead code Applying: memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc* Applying: memblock: remove _virt from APIs returning virtual address Applying: memblock: replace alloc_bootmem_align with memblock_alloc Applying: memblock: replace alloc_bootmem_low with memblock_alloc_low Applying: memblock: replace __alloc_bootmem_node_nopanic with memblock_alloc_try_nid_nopanic Applying: memblock: replace alloc_bootmem_pages_nopanic with memblock_alloc_nopanic Applying: memblock: replace alloc_bootmem_low with memblock_alloc_low (2) Applying: memblock: replace __alloc_bootmem_nopanic with memblock_alloc_from_nopanic Applying: memblock: add align parameter to memblock_alloc_node() Applying: memblock: replace alloc_bootmem_pages_node with memblock_alloc_node Applying: memblock: replace __alloc_bootmem_node with appropriate memblock_ API Applying: memblock: replace alloc_bootmem_node with memblock_alloc_node Applying: memblock: replace alloc_bootmem_low_pages with memblock_alloc_low Applying: memblock: replace alloc_bootmem_pages with memblock_alloc Applying: memblock: replace __alloc_bootmem with memblock_alloc_from Applying: memblock: replace alloc_bootmem with memblock_alloc Applying: mm: nobootmem: remove bootmem allocation APIs Applying: memblock: replace free_bootmem{_node} with memblock_free Applying: memblock: replace free_bootmem_late with memblock_free_late Applying: memblock: rename free_all_bootmem to memblock_free_all Applying: memblock: rename __free_pages_bootmem to memblock_free_pages Applying: mm: remove nobootmem Applying: memblock: replace BOOTMEM_ALLOC_* with MEMBLOCK variants Applying: mm: remove include/linux/bootmem.h Applying: dma-direct: fix up for the removal of linux/bootmem.h Applying: docs/boot-time-mm: remove bootmem documentation Applying: drivers/android/binder_alloc.c: replace vm_insert_page with vmf_insert_page Applying: mm/memory_hotplug: make remove_memory() take the device_hotplug_lock Applying: mm/memory_hotplug: make add_memory() take the device_hotplug_lock Applying: mm/memory_hotplug: fix online/offline_pages called w.o. mem_hotplug_lock Applying: powerpc/powernv: hold device_hotplug_lock when calling device_online() Applying: powerpc/powernv: hold device_hotplug_lock when calling memtrace_offline_pages() Applying: powerpc-powernv-hold-device_hotplug_lock-when-calling-memtrace_offline_pages-v3 Applying: memory-hotplug.txt: add some details about locking internals Applying: mm: Fix warning in insert_pfn() 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 (fe8973ee6747 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgpzV41pQpzG4.pgp
Description: OpenPGP digital signature
