Hi all, Changes since 20181218: New tree: kgdb-dt The rdma tree still had its build failure so I used a supplied patch. The kvm tree gained a conflict against the tip tree and a build failure for which I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 9805 10005 files changed, 472520 insertions(+), 262947 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 292 trees (counting Linus' and 69 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 (ddfbab46539f Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs) Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2) Merging arc-current/for-curr (bc2cbf2cc506 ARC: perf: map generic branches to correct hardware condition) Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return) Merging arm64-fixes/for-next/fixes (3238c359acee arm64: dma-mapping: Fix FORCE_CONTIGUOUS buffer clearing) Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode) Merging powerpc-fixes/fixes (a225f1567405 powerpc/ptrace: replace ptrace_report_syscall() with a tracehook call) Merging sparc/master (cf76c364a1e1 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 (a915b982d8f5 VSOCK: Send reset control packet when socket is partially bound) Merging bpf/master (bcb671c2fa0e bpf: promote bpf_perf_event.h to mandatory UAPI header) Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on acquire) Merging netfilter/master (9e69efd45321 Merge branch 'vhost-fixes') Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging wireless-drivers/master (eca1e56ceedd iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT to old firmwares) Merging mac80211/master (442147d0ea77 mac80211: free skb fraglist before freeing the skb) Merging rdma-fixes/for-rc (37fbd834b4e4 IB/core: Fix oops in netdev_next_upper_dev_rcu()) Merging sound-current/for-linus (0bea4cc83835 ALSA: hda/realtek: Enable audio jacks of ASUS UX433FN/UX333FA with ALC294) Merging sound-asoc-fixes/for-linus (1e7a78c1a3ca Merge branch 'asoc-4.20' into asoc-linus) Merging regmap-fixes/for-linus (40e020c129cf Linux 4.20-rc6) Merging regulator-fixes/for-linus (71b6b0e0d12f Merge branch 'regulator-4.20' into regulator-linus) Merging spi-fixes/for-linus (111c49e0eef9 Merge branch 'spi-4.20' into spi-linus) Merging pci-current/for-linus (1063a5148ac9 PCI/AER: Queue one GHES event, not several uninitialized ones) Merging driver-core.current/driver-core-linus (2595646791c3 Linux 4.20-rc5) Merging tty.current/tty-linus (3c9dc275dba1 Revert "serial: 8250: Fix clearing FIFOs in RS485 mode again") Merging usb.current/usb-linus (2419f30a4a4f USB: xhci: fix 'broken_suspend' placement in struct xchi_hcd) Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of out transfers when DMA is used) Merging usb-serial-fixes/usb-linus (28a86092b175 USB: serial: option: add Telit LN940 series) Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code) Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with fused value for SDM845) Merging staging.current/staging-linus (40e020c129cf Linux 4.20-rc6) Merging char-misc.current/char-misc-linus (55449af1a17a Merge tag 'hyperv-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux into char-misc-linus) Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1) Merging thunderbolt-fixes/fixes (7566ec393f41 Linux 4.20-rc7) Merging input-current/for-linus (ca5047286c9c Input: synaptics - enable RMI on ThinkPad T560) Merging crypto-current/master (e61efff4ae94 crypto: user - Disable statistics interface) Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name comparisons) Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1) Merging kselftest-fixes/fixes (2bd61abead58 selftests/seccomp: Remove SIGSTOP si_pid check) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) Merging slave-dma-fixes/fixes (ffe843b18211 dmaengine: dw: Fix FIFO size for Intel Merrifield) Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) Merging mtd-fixes/master (40b412897ccb mtd: nand: Fix memory allocation in nanddev_bbt_init()) Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data") Merging v4l-dvb-fixes/fixes (078ab3ea2c3b media: Add a Kconfig option for the Request API) Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0) Merging mips-fixes/mips-fixes (e8e8d449b9e6 MIPS: BCM63XX: fix switch core reset on BCM6368) Merging at91-fixes/at91-fixes (4ab7ca092c3c ARM: dts: at91: sama5d2: use the divided clock for SMC) Merging omap-fixes/fixes (84fb6c7feb14 ARM: dts: Fix OMAP4430 SDP Ethernet startup) Merging kvm-fixes/master (fd65d3142f73 kvm: svm: Ensure an IBPB on all affected CPUs when freeing a vmcb) Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs) Merging hwmon-fixes/hwmon (2595646791c3 Linux 4.20-rc5) Merging nvdimm-fixes/libnvdimm-fixes (2c5357c6a2f2 Merge branch 'for-4.20/dax-fixes' into libnvdimm-pending) Merging btrfs-fixes/next-fixes (72549bc085d6 Merge branch 'misc-4.20' into next-fixes) Merging vfs-fixes/fixes (ea5751ccd665 proc/sysctl: don't return ENOMEM on lookup when a table is unregistering) Merging dma-mapping-fixes/for-linus (c92a54cfa025 dma-direct: do not include SME mask in the DMA supported check) Merging i3c-fixes/master (651022382c7f Linux 4.20-rc1) Merging drivers-x86-fixes/fixes (651022382c7f Linux 4.20-rc1) Merging samsung-krzk-fixes/fixes (651022382c7f Linux 4.20-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1) Merging devicetree-fixes/dt/linus (cea5d45ea6d8 of: __of_detach_node() - remove node from phandle cache) Merging scsi-fixes/fixes (61cce6f6eece scsi: sd: use mempool for discard special page) Merging drm-fixes/drm-fixes (7566ec393f41 Linux 4.20-rc7) Merging drm-intel-fixes/for-linux-next-fixes (7566ec393f41 Linux 4.20-rc7) Merging mmc-fixes/fixes (e3ae3401aa19 mmc: core: Use a minimum 1600ms timeout when enabling CACHE ctrl) Merging rtc-fixes/rtc-fixes (9bde0afb7a90 rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write) Merging gnss-fixes/gnss-linus (40e020c129cf Linux 4.20-rc6) Merging hyperv-fixes/hyperv-fixes (fda2485b9ca4 Drivers: hv: vmbus: Check for ring when getting debug info) Merging drm-misc-fixes/for-linux-next-fixes (63238173b2fa Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec") Merging kbuild/for-next (d411ff4a93d5 Merge branches 'kbuild', 'kbuild2', 'kconfig' and 'kconfig2' into for-next) Merging compiler-attributes/compiler-attributes (71391bdd2e9a include/linux/compiler_types.h: don't pollute userspace with macro definitions) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) Merging dma-mapping/for-next (664204410afb PCI: Remove unused attr variable in pci_dma_configure) CONFLICT (content): Merge conflict in arch/alpha/Kconfig Merging asm-generic/master (b7d624ab4312 asm-generic: unistd.h: fixup broken macro include.) Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) Merging arm/for-next (eb1644e1ec8a Merge branches 'fixes', 'misc', 'sa1100-for-next' and 'spectre' into for-next) Merging arm64/for-next/core (12f799c8c739 arm64: kaslr: print PHYS_OFFSET in dump_kernel_offset()) CONFLICT (content): Merge conflict in arch/arm64/kernel/cpu_errata.c CONFLICT (content): Merge conflict in arch/arm64/Kconfig CONFLICT (content): Merge conflict in Documentation/arm64/silicon-errata.txt Merging arm-perf/for-next/perf (69c32972d593 drivers/perf: Add Cavium ThunderX2 SoC UNCORE PMU driver) Merging arm-soc/for-next (de7cfed01ee4 ARM: Document merges) CONFLICT (content): Merge conflict in arch/arm/mach-socfpga/Kconfig 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 (b28b14c7c157 Merge branch 'v4.21/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (f59cffb441bc Merge branch 'dt-for-v4.21' into for-next) Merging at91/at91-next (d3d7c4c30eb2 Merge branches 'at91-soc' and 'at91-dt' into at91-next) Merging bcm2835/for-next (3c9d403d2fe1 Merge branch 'bcm2835-drivers-next' into for-next) Merging imx-mxs/for-next (467e1ec42943 Merge branch 'imx8mq/dt' into for-next) Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next) Merging mediatek/for-next (c2f7a6c7e1e5 Merge branch 'v4.20-next/soc' into for-next) Merging mvebu/for-next (50eba438c55e Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (ace233293086 Merge branch 'omap-for-v4.21/dt' into for-next) Merging reset/reset/next (8a1b9fd55f25 reset: uniphier-glue: Add AHCI reset control support in glue layer) CONFLICT (content): Merge conflict in arch/arm/mach-socfpga/socfpga.c Merging qcom/for-next (9bf0624f555d Merge tag 'qcom-drivers-for-4.21-2' into foobar-for-4.21-2) Merging renesas/next (f0722e173448 Merge branches 'fixes-for-v4.21', 'fixes-for-v4.20', 'dt-bindings-for-v4.21', 'drivers-for-v4.21', 'arm-defconfig-for-v4.21', 'arm-dt-for-v4.21' and 'arm64-dt-for-v4.21' into next) Merging rockchip/for-next (70e6e2983473 dt-bindings: arm: Convert Rockchip board/soc bindings to json-schema) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (75c4a4541891 Merge branch 'next/dt64' into for-next) Merging sunxi/sunxi/for-next (ef9c186f08d7 Merge branch 'sunxi/dt-for-4.21' into sunxi/for-next) Merging tegra/for-next (2731820ce27b Merge branch for-4.21/clk into for-next) Merging clk/clk-next (b677574bdf29 Merge branch 'clk-imx7ulp' into clk-next) Merging clk-samsung/for-next (651022382c7f Linux 4.20-rc1) Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging csky/linux-next (252050365823 dt-bindings: timer: gx6605s SOC timer) Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no) Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) Merging m68k/for-next (005e13a96c0e m68k: Generate uapi header and syscall table header files) Merging m68knommu/for-next (40e020c129cf Linux 4.20-rc6) Merging microblaze/next (19d111ccce9f microblaze: remove the explicit removal of system.dtb) Merging mips/mips-next (ff4dd232ec45 MIPS: Expand MIPS32 ASIDs to 64 bits) CONFLICT (content): Merge conflict in arch/mips/Kconfig Merging nds32/next (e2f3f8b4a497 nds32: support hardware prefetcher) Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TLB with the new PTE) Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops) Merging parisc-hd/for-next (930e12992ed3 parisc: syscalls: ignore nfsservctl for other architectures) Merging powerpc/next (7c91efce1608 powerpc/mm: dump block address translation on book3s/32) Merging fsl/next (b6ae3550c8e2 powerpc/8xx: add missing header in 8xx_mmu.c) Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) Merging risc-v/for-next (9c60096d499e automerging branch "kernel.org-palmer-linux/next-sg_chain" into "for-next") Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) Merging s390/features (ec10574d00da Merge tag 'vfio-ccw-20181213' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features) Merging sparc-next/master (c23b8e7acea3 ALSA: sparc: Use of_node_name_eq for node name comparisons) CONFLICT (content): Merge conflict in arch/sparc/kernel/ioport.c Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) Merging uml/linux-next (917e2fd2c53e um: Make line/tty semantics use true write IRQ) Merging xtensa/xtensa-for-next (c31f54cdc8da Merge branch 'xtensa-tracehook' into xtensa-for-next) Merging fscrypt/master (cc0146d0bce0 fscrypt: remove CRYPTO_CTR dependency) 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 (630d835a66f8 Merge branch 'for-next-current-v4.19-20181217' into for-next-20181217) Merging ceph/master (6f9718fe41c3 ceph: make 'nocopyfrom' a default mount option) Merging cifs/for-next (76df9c9935ed cifs: Fix to use kmem_cache_free() instead of kfree()) 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 (3f0216106126 Pull quota locking fix.) Merging ext4/dev (7d3485c5e875 ext4: avoid declaring fs inconsistent due to invalid file handles) Merging f2fs/dev (ac3c962cc168 f2fs: clear PG_writeback if IPU failed) CONFLICT (content): Merge conflict in fs/f2fs/dir.c Merging fuse/for-next (2e64ff154ce6 fuse: continue to send FUSE_RELEASEDIR when FUSE_OPEN returns ENOSYS) Merging jfs/jfs-next (a83722f45c5b jfs: fix spelling mistake, EACCESS -> EACCES) Merging nfs/linux-next (abc13275771f SUNRPC: Remove xprt_connect_status()) Merging nfs-anna/linux-next (bae47e41c9ea sunrpc: Be sure to clear XPRT_WRITE_SPACE when resetting the transport) Merging nfsd/nfsd-next (19f25957be17 nfsd: keep a tally of RECLAIM_COMPLETE operations when using nfsdcld) Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0) Merging overlayfs/overlayfs-next (ec7ba118b940 Revert "ovl: relax permission checking on underlying layers") Merging ubifs/linux-next (e58725d51fa8 ubifs: Handle re-linking of inodes correctly while recovery) CONFLICT (content): Merge conflict in fs/ubifs/Kconfig Merging v9fs/9p-next (7373bc7654c1 9p/net: put a lower bound on msize) Merging xfs/for-next (a9d25bde1e9b xfs: Fix x32 ioctls when cmd numbers differ from ia32.) Merging file-locks/locks-next (052b8cfa4070 locks: Use inode_is_open_for_write) Merging vfs/for-next (c6e2c0d2aa9a Merge branches 'work.mount', 'work.misc', 'misc.misc' and 'work.iov_iter' into for-next) CONFLICT (content): Merge conflict in include/linux/fs.h CONFLICT (content): Merge conflict in fs/Makefile Merging printk/for-next (15ff2069cb7f printk: Add caller information to printk() output.) Merging pci/next (7053eeb009e0 Merge branch 'remotes/lorenzo/pci/mediatek') Merging pstore/for-next/pstore (8665569e97dd pstore/ram: Avoid NULL deref in ftrace merging failure path) Merging hid/for-next (f384956b686e Merge branch 'for-4.20/upstream-fixes' into for-next) Merging i2c/i2c/for-next (eb7dd4b831c0 Merge branch 'i2c/for-5.0' into i2c/for-next) Merging i3c/i3c/next (25ac3da61ba1 i3c: master: cdns: fix I2C transfers in Cadence I3C master driver) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (f9facc24a644 hwmon: (asus_atk0110) Fix debugfs_simple_attr.cocci warnings) Merging jc_docs/docs-next (f77af637f29d doc:process: add links where missing) CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst Merging v4l-dvb/master (daad52c8aa4f media: drxk_hard: check if parameter is not NULL) Applying: media: ddbridge: Move asm includes after linux ones Merging v4l-dvb-next/master (76097fe1aee6 media: staging/ipu3-imgu: Add MAINTAINERS entry) Merging fbdev/fbdev-for-next (217188d9f985 video: fbdev: remove redundant 'default n' from Kconfig-s) Merging pm/linux-next (8e10d25f1db2 Merge branches 'pm-qos', 'pm-devfreq', 'pm-sleep' and 'pm-avs' into linux-next) Merging cpupower/cpupower (901d32bc69f3 cpupower : Auto-completion for cpupower tool) Merging opp/opp/linux-next (ade0c9493e97 Merge branch 'opp/genpd/propagation' into opp/linux-next) Merging thermal/next (eaaa598c0a28 Merge branches 'for-rc' and 'thermal-core' into next) CONFLICT (content): Merge conflict in drivers/thermal/Kconfig Applying: drivers: thermal: fixup for Kconfig string parsing tightening up Merging thermal-soc/next (760eea43f8c6 thermal: da9062/61: Prevent hardware access during system suspend) Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency) Merging dlm/next (3595c559326d dlm: fix invalid cluster name warning) Merging swiotlb/linux-next (da689221f952 xen/blkfront: avoid NULL blkfront_info dereference on device removal) Merging rdma/for-next (4785860e04bc RDMA/uverbs: Implement an ioctl that can call write and write_ex handlers) CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h Applying: RDMA/mlx5: Delete unreachable handle_atomic code by simplifying SW completion Merging net-next/master (a26d94bff4d5 net: bridge: remove unneeded variable 'err') CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/test_verifier.c CONFLICT (content): Merge conflict in net/ipv6/ip6_output.c CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c CONFLICT (content): Merge conflict in drivers/crypto/chelsio/chtls/chtls_cm.c CONFLICT (content): Merge conflict in arch/mips/include/uapi/asm/inst.h CONFLICT (content): Merge conflict in MAINTAINERS Merging bpf-next/master (76c43ae84e3f bpf: log struct/union attribute for forward type) Merging ipsec-next/master (77990464bb39 xfrm: clean an indentation issue, remove a space) Merging mlx5-next/mlx5-next (199fa087dc6b net/mlx5: Continue driver initialization despite debugfs failure) Merging netfilter-next/master (241faeceb849 netfilter: nf_tables: Speed up selective rule dumps) 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 (30ed3c6c0922 Merge tag 'iwlwifi-next-for-kalle-2018-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) Merging bluetooth/master (8589086f4efd Bluetooth: hci_h5: Turn off RTL8723BS on suspend, reprobe on resume) Merging mac80211-next/master (30c63115e20b nl80211: Add support to notify radar event info received from STA) Merging gfs2/for-next (bc0205612bbd gfs2: take jdata unstuff into account in do_grow) Merging mtd/mtd/next (f366d3854ec0 Merge tag 'spi-nor/for-4.21' of git://git.infradead.org/linux-mtd into mtd/next) Merging nand/nand/next (732774437ae0 mtd: rawnand: sunxi: Write pageprog related opcodes to WCMD_SET) Merging spi-nor/spi-nor/next (b422847877e3 mtd: spi-nor: Add support for is25lp016d) Merging crypto/master (00c9fe37a7f2 crypto: adiantum - fix leaking reference to hash algorithm) Merging drm/drm-next (221b35fedee1 Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/meson/meson_crtc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_workarounds.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_workarounds.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c Merging drm-intel/for-linux-next (cb6f4c2c3478 Merge tag 'gvt-next-2018-12-07' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) Merging drm-tegra/drm/tegra/for-next (180b46ecdc9f drm/tegra: sor: Reset the SOR if possible) Merging drm-misc/for-linux-next (0b258ed1a219 drm: revert "expand replace_fence to support timeline point v2") Merging drm-msm/msm-next (ba0ede185ef4 drm/msm/dpu: Fix clock issue after bind failure) Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (fd99bd8b805c drm: malidp: Add the size of the superblocks when calculating total size for AFBC buffers) Merging imx-drm/imx-drm/next (6cec571b70ec drm/imx: ipuv3-plane: add function to query atomic update status) Merging etnaviv/etnaviv/next (801c7a1e5286 drm/etnaviv: remove lastctx member from gpu struct) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (cefbade458fb Merge remote-tracking branch 'regmap/topic/irq' into regmap-next) Merging sound/for-next (ed49e839199e Merge tag 'asoc-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next) Merging sound-asoc/for-next (3f4cb5fd8465 Merge branch 'asoc-4.21' into asoc-next) Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsyms on Thumb-2) Merging input/next (0832e93632c6 Input: rotary-encoder - don't log EPROBE_DEFER to kernel log) Merging block/for-next (9b41439af4e9 Merge branch 'for-4.21/block' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/sd.c Merging device-mapper/for-next (bd938bf0b6cf Merge branch 'dm-4.20' into dm-next) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (ca804a5615a7 mmc: renesas_sdhi_internal_dmac: Whitelist r8a774c0) Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) Merging md/for-next (cac09f066f0f md: remvoe redundant condition check) Merging mfd/for-mfd-next (d0c97d5a721b mfd: tps65218: Use devm_regmap_add_irq_chip and clean up error path in probe()) Merging backlight/for-backlight-next (3cee7a7d05b1 backlight: 88pm860x_bl: Use of_node_name_eq for node name comparisons) Merging battery/for-next (958091396648 power: supply: bq25890: fix BAT_COMP field definition) Merging regulator/for-next (27f8169d2f4c Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next) Merging security/next-testing (e5a7e9283f51 Merge branch 'next-integrity' into next-testing) Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute) Merging integrity/next-integrity (eed9de3b4f47 ima: Use inode_is_open_for_write) Merging selinux/next (ee1a84fdfeed selinux: overhaul sidtab to fix bug and improve performance) CONFLICT (content): Merge conflict in security/selinux/hooks.c Applying: update for "selinux: always allow mounting submounts" Merging tpmdd/next (9488585b21be tpm: add support for partial reads) Merging watchdog/master (31eb42bd9353 watchdog: w83627hf_wdt: Add quirk for Inves system) Merging iommu/next (b9374e6eb8ba Merge branches 'iommu/fixes', 'arm/renesas', 'arm/mediatek', 'arm/tegra', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (8ba35b3a0046 vfio-mdev/samples: Use u8 instead of char for handle functions) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (d406db524c32 audit: remove duplicated include from audit.c) Merging devicetree/for-next (acc2038738bd Merge branch 'yaml-bindings-for-v4.21' into dt/next) Merging mailbox/mailbox-for-next (e2affdbef2ac mailbox: bcm2835: Switch to SPDX identifier) Merging spi/for-next (a68a1c05aee3 Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next) Merging tip/auto-latest (24e141b41e0c Merge branch 'x86/urgent') CONFLICT (content): Merge conflict in net/bridge/br_multicast.c CONFLICT (content): Merge conflict in net/bridge/br_mdb.c CONFLICT (content): Merge conflict in drivers/hwmon/k10temp.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/resctrl/rdtgroup.c CONFLICT (content): Merge conflict in MAINTAINERS Merging clockevents/clockevents/next (ded414ebcd58 clocksource/drivers/fttmr010: Fix invalid interrupt register access) Merging edac-amd/for-next (bd4473541822 EDAC, i5000: Remove set but not used local variables) Merging irqchip/irq/irqchip-next (fb94109b764e irqchip/stm32: protect configuration registers with hwspinlock) Merging ftrace/for-next (dbc3f042fbc8 selftests/ftrace: Add testcases for dynamic event) Merging rcu/rcu/next (06aa5694f870 Merge LKMM and RCU commits) CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/runlitmushist.sh CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/parseargs.sh CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/newlitmushist.sh CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/judgelitmus.sh CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/initlitmushist.sh CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/checklitmushist.sh CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/checkghlitmus.sh Merging kvm/linux-next (5132411985e1 kvm: selftests: ucall: improve ucall placement in memory, fix unsigned comparison) CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c CONFLICT (modify/delete): arch/x86/kvm/vmx.c deleted in kvm/linux-next and modified in HEAD. Version HEAD of arch/x86/kvm/vmx.c left in tree. $ git rm -f arch/x86/kvm/vmx.c Applying: update to "x86: Fix various typos in comments" Applying: kvm: tidy up from MPX removal Merging kvm-arm/next (1e63d2057138 arm64: KVM: Avoid setting the upper 32 bits of VTCR_EL2 to 1) Merging kvm-ppc/kvm-ppc-next (95d386c2d2e7 KVM: PPC: Book3S HV: Allow passthrough of an emulated device to an L3 guest) Merging kvms390/next (ed3054a30258 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext) Merging xen-tip/linux-next (58f9d806d16a ALSA: xen-front: Use Xen common shared buffer implementation) Merging percpu/for-next (ad19ef010db1 Merge branch 'for-4.19-fixes' into for-next) Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing) Merging drivers-x86/for-next (fb7255a92311 platform/x86: mlx-platform: Convert to use SPDX identifier) Merging chrome-platform/for-next (2a70a4cda0da MAINTAINERS: platform/chrome: Add Enric as a maintainer) CONFLICT (content): Merge conflict in MAINTAINERS Merging hsi/for-next (3a658e09a215 HSI: omap_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro) Merging leds/for-next (8146aace60c7 led: triggers: Initialize LED_INIT_DEFAULT_TRIGGER if trigger is brought after class) Merging ipmi/for-next (5e6ddecfc90b ipmi:ssif: Change some pr_xxx to dev_xxx calls) Merging driver-core/driver-core-next (df44b479654f kobject: return error code if writing /sys/.../uevent fails) CONFLICT (content): Merge conflict in drivers/base/platform.c Merging usb/usb-next (1d6e81a288e2 usb: renesas_usbhs: add support for RZ/G2E) Merging usb-gadget/next (4fe4f9fecc36 usb: dwc2: Fix disable all EP's on disconnect) Merging usb-serial/usb-next (8d503f206c33 USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays) Merging usb-chipidea-next/ci-for-usb-next (9049fce897ed usb: chipidea: imx: allow to configure oc polarity on i.MX25) Merging phy-next/next (2e38c2e7026a phy: qcom-qmp: Expose provided clocks to DT) Merging tty/tty-next (ec18f48bbc41 tty: serial: samsung: Increase maximum baudrate) Merging char-misc/char-misc-next (2701e804f00f Merge tag 'extcon-next-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) CONFLICT (content): Merge conflict in drivers/misc/Makefile Merging extcon/extcon-next (a2dc50914744 extcon: max8997: Fix lack of path setting in USB device mode) Merging soundwire/next (b1635596860d soundwire: intel: constify snd_soc_dai_ops structures) Merging thunderbolt/next (dcc3c9e37fbd thunderbolt: Export IOMMU based DMA protection support to userspace) Merging staging/staging-next (d464b7dba1b8 staging: most: Documentation: add information to driver_usage file) CONFLICT (content): Merge conflict in drivers/staging/vboxvideo/vbox_ttm.c CONFLICT (content): Merge conflict in drivers/staging/media/tegra-vde/tegra-vde.c Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (f8325633fbae MAINTAINERS: add a maintainer for the interconnect API) Merging slave-dma/next (8fc4a3d104a3 Merge branch 'topic/fsl' into next) Merging cgroup/for-next (87f902fab430 Merge branch 'for-4.21' into for-next) Merging scsi/for-next (147ba5fbfde1 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (38417468d4f0 scsi: block: remove the cluster flag) 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 (37d1246af2d5 virtio_net: bulk free tx skbs) Merging rpmsg/for-next (9099a252d44c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (62bcb6773bd4 Merge branch 'devel' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-ams-delta.c Merging pinctrl/for-next (a0d2f28f58d3 Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1) Merging pwm/for-next (46275577b86a pwm: bcm2835: Switch to SPDX identifier) Merging userns/for-next (1e9c75fb9c47 mnt: fix __detach_mounts infinite loop) Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static) Merging kselftest/next (283ac6d5fb2a selftests: Fix test errors related to lib.mk khdr target) Merging y2038/y2038 (e4b92b108c6c timekeeping: remove obsolete time accessors) Merging livepatching/for-next (bd0ab5efe8ec Merge branch 'for-4.21/upstream' into for-next) Merging coresight/next (7ff8957175d6 coresight: Use of_node_name_eq for node name comparisons) Merging rtc/rtc-next (fc979933bcf1 rtc: pcf85363: Add support for NXP pcf85263 rtc) Merging nvdimm/libnvdimm-for-next (594861215c83 acpi, nfit: Further restrict userspace ARS start requests) Merging at24/at24/for-next (37cf28d3b5bc eeprom: at24: add support for 24c2048) Merging ntb/ntb-next (d9842b39e9ec ntb_hw_switchtec: Added support of >=4G memory windows) Merging kspp/for-next/kspp (be1944712d8e Merge branch 'for-next/gcc-plugin/arm-stackprotector' into for-next/kspp) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next) CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c Merging gnss/gnss-next (2595646791c3 Linux 4.20-rc5) Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging slimbus/for-next (39a577fe6163 slimbus: ngd: fix spelling mistake "exeeds" -> "exceeds") Merging nvmem/for-next (5035d66cc629 nvmem: meson-efuse: add peripheral clock) CONFLICT (content): Merge conflict in include/linux/nvmem-provider.h Merging xarray/xarray (48483614de97 XArray: Fix xa_alloc when id exceeds max) Merging hyperv/hyperv-next (651022382c7f Linux 4.20-rc1) Merging auxdisplay/auxdisplay (d4683eee8cd6 auxdisplay: charlcd: fix x/y command parsing) Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops) Merging akpm-current/current (107faad469e1 ipc: conserve sequence numbers in extended IPCMNI mode) CONFLICT (content): Merge conflict in arch/arm64/mm/proc.S CONFLICT (content): Merge conflict in arch/arm64/mm/mmu.c CONFLICT (content): Merge conflict in arch/arm64/include/asm/memory.h $ git checkout -b akpm remotes/origin/akpm/master Applying: scripts/atomic/check-atomics.sh: don't assume that scripts are executable Applying: lib/test_debug_virtual.c: fix build failure Applying: mm: treewide: remove unused address argument from pte_alloc functions Applying: mm-treewide-remove-unused-address-argument-from-pte_alloc-functions-v2-fix Applying: mm: speed up mremap by 20x on large regions Applying: mm/mremap: fix 'move_normal_pmd' unused function warning Applying: mm: select HAVE_MOVE_PMD on x86 for faster mremap Applying: kernel/async.c: remove some duplicated includes Applying: kernel/signal.c: remove some duplicated includes Applying: locking/atomics: build atomic headers as required Applying: mm: balloon: update comment about isolation/migration/compaction Applying: mm: convert PG_balloon to PG_offline Applying: mm-convert-pg_balloon-to-pg_offline-fix Applying: kexec: export PG_offline to VMCOREINFO Applying: xen/balloon: mark inflated pages PG_offline Applying: hv_balloon: mark inflated pages PG_offline Applying: vmw_balloon: mark inflated pages PG_offline Applying: vmw_balloon-mark-inflated-pages-pg_offline-v2 Applying: PM/Hibernate: use pfn_to_online_page() Applying: PM/Hibernate: exclude all PageOffline() pages Applying: pm-hibernate-exclude-all-pageoffline-pages-v2 Applying: kernel/locking/mutex.c: remove caller signal_pending branch predictions Applying: kernel/sched/: remove caller signal_pending branch predictions Applying: arch/arc/mm/fault.c: remove caller signal_pending_branch predictions Applying: mm/: remove caller signal_pending branch predictions Applying: fs/: remove caller signal_pending branch predictions Applying: fs-remove-caller-signal_pending-branch-predictions-fix Applying: include/linux/sched/signal.h: replace `tsk' with `task' Applying: fs: don't open code lru_to_page() Applying: drivers/base/platform.c: kmemleak ignore a known leak Applying: docs: fix Co-Developed-by docs Applying: checkpatch: add Co-developed-by to signature tags Applying: mm/page_io.c: fix polled swap page in Applying: kernel/fork.c: remove duplicated include Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Applying: openvswitch: convert to kvmalloc Applying: md: convert to kvmalloc Applying: selinux: convert to kvmalloc Applying: Generic radix trees Applying: proc: commit to genradix Applying: sctp: convert to genradix Applying: Drop flex_arrays Merging akpm/master (ed4a931586dc Drop flex_arrays)
Attachment:
pgpfFVSd3AWcC.pgp
Description: OpenPGP digital signature
