Hi all, Changes since 20181207: The thermal tree lost its build failure. The rdma tree still had its build failure so I used the version from next-20181203. The net-next tree gained conflicts against the net tree. The drm-msm tree gained a conflict against the drm tree. The rcu tree gained a conflict against the crypto tree. The driver-core tree gained a conflict against the pm tree. The staging tree gained a conflict against the v4l-dvb tree. The scsi-mkp tree gained a conflict against Linus' tree. The gpio tree gained a build failure so I used the version from next-20181207. The akpm-current tree still had its build failure for which I added a fix patch. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 7550 7857 files changed, 358434 insertions(+), 201724 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 288 trees (counting Linus' and 68 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 (0844895a2e51 Merge tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs) Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2) Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement reads{x}()/writes{x}()) Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return) Merging arm64-fixes/for-next/fixes (b4aecf78083d arm64: hibernate: Avoid sending cross-calling with interrupts disabled) Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode) Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when setting up legacy consoles) 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 (35cc3cefc4de net/sched: cls_flower: Reject duplicated rules also under skip_sw) Merging bpf/master (ec3d837aac5d net/flow_dissector: correctly cap nhoff and thoff in case of BPF) Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on acquire) Merging netfilter/master (530aad77010b netfilter: seqadj: re-load tcp header pointer after possible head reallocation) Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set) Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4) Merging mac80211/master (312ca38ddda6 cfg80211: Fix busy loop regression in ieee80211_ie_split_ric()) Merging rdma-fixes/for-rc (47f07f03b5ee IB/mlx5: Block DEVX umem from the non applicable cases) Merging sound-current/for-linus (fa9c98e4b975 ALSA: fireface: fix reference to wrong register for clock configuration) Merging sound-asoc-fixes/for-linus (b99f6edf9be5 Merge branch 'asoc-4.20' into asoc-linus) Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3) Merging regulator-fixes/for-linus (8852a24b6675 Merge branch 'regulator-4.20' into regulator-linus) Merging spi-fixes/for-linus (a78de6b8fb72 Merge branch 'spi-4.20' into spi-linus) Merging pci-current/for-linus (b07b864ee423 Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is set") Merging driver-core.current/driver-core-linus (2595646791c3 Linux 4.20-rc5) Merging tty.current/tty-linus (dada6a43b040 kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var()) Merging usb.current/usb-linus (3caad34eab57 Merge tag 'usb-serial-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of out transfers when DMA is used) Merging usb-serial-fixes/usb-linus (f51ccf46217c USB: serial: console: fix reported terminal settings) 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 (87e4a5405f08 Revert commit ef9209b642f "staging: rtl8723bs: Fix indenting errors and an off-by-one mistake in core/rtw_mlme_ext.c") Merging char-misc.current/char-misc-linus (dbde117c3126 Merge tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss into char-misc-linus) Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1) Merging thunderbolt-fixes/fixes (2595646791c3 Linux 4.20-rc5) 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 (651022382c7f Linux 4.20-rc1) 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 (20b880a05f06 mips: bpf: fix encoding bug for mm_srlv32_op) 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 (73116df7bb90 afs: Use d_instantiate() rather than d_add() and don't d_drop()) Merging dma-mapping-fixes/for-linus (cb216b84d6ea swiotlb: Skip cache maintenance on map error) 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 (89c38422e072 of, numa: Validate some distance map rules) Merging scsi-fixes/fixes (60a89a3ce0cc scsi: t10-pi: Return correct ref tag when queue has no integrity profile) Merging drm-fixes/drm-fixes (e594a5e349dd drm/ast: Fix connector leak during driver unload) Merging drm-intel-fixes/for-linux-next-fixes (d76b21ebf8ff Merge tag 'gvt-fixes-2018-12-04' of https://github.com/intel/gvt-linux into drm-intel-fixes) Merging mmc-fixes/fixes (b704441e38f6 mmc: sdhci: fix the timeout check window for clock and reset) Merging rtc-fixes/rtc-fixes (9bde0afb7a90 rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write) Merging gnss-fixes/gnss-linus (63cea1f73528 MAINTAINERS: exclude gnss from SIRFPRIMA2 regex matching) Merging drm-misc-fixes/for-linux-next-fixes (b31a3ca745a4 drm/fb-helper: Fix typo in parameter description) Merging kbuild/for-next (edc8351ce260 Merge branches 'kbuild', 'kbuild2', 'kconfig' and 'kconfig2' into for-next) Merging compiler-attributes/compiler-attributes (24efee412c75 Compiler Attributes: improve explanation of header) Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) Merging dma-mapping/for-next (7c703e54cc71 arch: switch the default on ARCH_HAS_SG_CHAIN) 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 arm-perf/for-next/perf (69c32972d593 drivers/perf: Add Cavium ThunderX2 SoC UNCORE PMU driver) Merging arm-soc/for-next (dabc839c6bd9 Merge branch 'fixes' into for-next) 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 (5a7dbcd21188 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 (39d48eea7c35 Merge branch 'at91-dt' into at91-next) Merging bcm2835/for-next (3c9d403d2fe1 Merge branch 'bcm2835-drivers-next' into for-next) Merging imx-mxs/for-next (f59289ce2225 Merge branch 'imx/defconfig' 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 (280879ca263a Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (36f22b9e78c5 Merge branch 'omap-for-v4.21/dt-ti-sysc' 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 (9a6ff76ee3da Merge tag 'qcom-drivers-for-4.21-2' into foobar-for-4.21) Merging renesas/next (87e4bacc17bc Merge branches 'fixes-for-v4.20', 'dt-bindings-for-v4.21', 'drivers-for-v4.21', 'soc-for-v4.21', 'arm-defconfig-for-v4.21', 'arm-dt-for-v4.21', 'arm64-dt-for-v4.21' and 'arm64-defconfig-for-v4.21' into next) Merging rockchip/for-next (7c806b7f750d Merge branch 'v4.20-armsoc/dts64-fixes' into for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (a409a4f4933a Merge branch 'next/defconfig' 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 arm64/for-next/core (396244692232 arm64: preempt: Provide our own implementation of asm/preempt.h) CONFLICT (content): Merge conflict in arch/arm64/kernel/cpu_errata.c Merging clk/clk-next (ae5db7b04fec Merge branch 'clk-allwinner' 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 (2595646791c3 Linux 4.20-rc5) Merging microblaze/next (1e17ab5320a6 microblaze: generate uapi header and system call table files) 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 (9c822e12cb23 parisc: Fix HP SDC hpa address output) 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 (7ac3574ad42f automerging branch "kernel.org-palmer-linux/next-tracepoints" into "for-next") CONFLICT (modify/delete): Documentation/features/io/sg-chain/arch-support.txt deleted in HEAD and modified in risc-v/for-next. Version risc-v/for-next of Documentation/features/io/sg-chain/arch-support.txt left in tree. $ git rm -f Documentation/features/io/sg-chain/arch-support.txt 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 (5b39fc049ce1 s390: use common bust_spinlocks()) Merging sparc-next/master (c23b8e7acea3 ALSA: sparc: Use of_node_name_eq for node name comparisons) 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 (cf991521b736 Merge branch 'xtensa-cleanups' into xtensa-for-next) Merging fscrypt/master (889645b87e96 fscrypt: add Adiantum support) 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 (86db915ae814 Merge branch 'for-next-next-v4.20-20181206' into for-next-20181206) Merging ceph/master (7e241f647dc7 libceph: fall back to sendmsg for slab pages) Merging cifs/for-next (8ec20a4fd3a3 cifs: update internal module version number) 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 (6eff7ce21cf1 Pull fanotify hardening from Kees Cook.) Merging ext4/dev (e647e29196b7 ext4: fix EXT4_IOC_GROUP_ADD ioctl) Merging f2fs/dev (19880e6e5ff3 f2fs: make "f2fs_fault_name[]" const char *) Merging fuse/for-next (d233c7dd1682 fuse: fix revalidation of attributes for permission check) Merging jfs/jfs-next (a83722f45c5b jfs: fix spelling mistake, EACCESS -> EACCES) Merging nfs/linux-next (5f179793f0a7 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) Merging nfs-anna/linux-next (9f0c5124f4a8 NFS: Don't open code clearing of delegation state) Merging nfsd/nfsd-next (255fbca65137 nfsd: Return EPERM, not EACCES, in some SETATTR cases) 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 (001260910c46 ubifs: auth: add CONFIG_KEYS dependency) Merging v9fs/9p-next (7373bc7654c1 9p/net: put a lower bound on msize) Merging xfs/for-next (8f67b5adc030 iomap: partially revert 4721a601099 (simulated directio short read on EFAULT)) Merging file-locks/locks-next (7bbd1fc0e9f1 fs/locks: remove unnecessary white space.) Merging vfs/for-next (d708e87ca399 Merge branch 'work.mount' into for-next) CONFLICT (content): Merge conflict in include/linux/fs.h CONFLICT (content): Merge conflict in fs/proc/inode.c CONFLICT (content): Merge conflict in fs/f2fs/super.c CONFLICT (content): Merge conflict in fs/compat_ioctl.c CONFLICT (content): Merge conflict in fs/Makefile CONFLICT (content): Merge conflict in drivers/vfio/Kconfig CONFLICT (content): Merge conflict in drivers/infiniband/Kconfig CONFLICT (content): Merge conflict in arch/sparc/kernel/setup_64.c Merging printk/for-next (9adcfaffc34d printk: Make printk_emit() local function.) Merging pci/next (c189eb40c3b9 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 (11478e44de6f Merge branch 'for-4.21/highres-wheel' into for-next) Merging i2c/i2c/for-next (0fce295d45bf Merge branch 'i2c/for-current-fixed' into i2c/for-next) Merging i3c/i3c/next (afe120c777b7 ic3: off by one in mode_show()) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (82b0120681e0 hwmon: (ltc4215) Auto-convert to use SENSOR_DEVICE_ATTR_{RO, RW, WO}) 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 (e159b6074c82 media: vimc: fix start stream when link is disabled) Merging v4l-dvb-next/master (357b50f3ccc8 drm: amd: dc: don't use FP math when Kcov is enabled) Merging fbdev/fbdev-for-next (217188d9f985 video: fbdev: remove redundant 'default n' from Kconfig-s) Merging pm/linux-next (0b71efed2eda Merge branch 'pm-cpuidle' into linux-next) Merging cpupower/cpupower (901d32bc69f3 cpupower : Auto-completion for cpupower tool) Merging opp/opp/linux-next (e822eac560a8 Merge branch 'opp/genpd/required-opps' into opp/linux-next) Merging thermal/next (eaaa598c0a28 Merge branches 'for-rc' and 'thermal-core' into next) 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 (81fce6291d99 RDMA/hns: Add SRQ asynchronous event support) $ git reset --hard HEAD^ Merging next-20181203 version of rdma Merging net-next/master (a60956ed72f7 net: dsa: Make dsa_master_set_mtu() static) CONFLICT (content): Merge conflict in tools/include/uapi/linux/bpf.h CONFLICT (content): Merge conflict in net/sched/cls_flower.c CONFLICT (content): Merge conflict in net/dsa/master.c CONFLICT (content): Merge conflict in net/core/filter.c CONFLICT (content): Merge conflict in kernel/bpf/btf.c CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h CONFLICT (content): Merge conflict in drivers/net/phy/phy_device.c CONFLICT (content): Merge conflict in drivers/net/ethernet/netronome/nfp/flower/offload.c Merging bpf-next/master (01d3240a04f4 media: bpf: add bpf function to report mouse movement) CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/test_verifier.c CONFLICT (content): Merge conflict in net/core/filter.c CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h CONFLICT (content): Merge conflict in arch/mips/include/uapi/asm/inst.h Merging ipsec-next/master (88584c30e319 xfrm: policy: fix policy hash rebuild) Merging mlx5-next/mlx5-next (3fd3c80acc17 net/mlx5: Expose packet based credit mode) CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mlx5_ib.h CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c Merging netfilter-next/master (6ed5943f8735 netfilter: nat: remove l4 protocol port rovers) 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 (d9bbd6a1a56e net: marvell: convert to DEFINE_SHOW_ATTRIBUTE) Merging bluetooth/master (ef2df7fc11f8 Merge branch 'Pass-extack-to-NETDEV_PRE_UP') Merging mac80211-next/master (f6c7f03f69f7 mac80211: fix deauth TX when we disconnect) Merging gfs2/for-next (b62cd8c96191 gfs2: Fix loop in gfs2_rbm_find) Merging mtd/mtd/next (9d3b5086f6d4 mtd: physmap_of_gemini: Handle pin control) Merging nand/nand/next (38842572df1c mtd: rawnand: jz4780: annotate implicit fall throughs) Merging spi-nor/spi-nor/next (52f1b43fd12e mtd: spi-nor: Add support for is25lp016d) Merging crypto/master (88d905e20b11 crypto: cavium/nitrox - convert to DEFINE_SHOW_ATTRIBUTE) Merging drm/drm-next (e69aa5f9b97f Merge tag 'drm-misc-next-2018-12-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) 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 (0b5b45a61d3f drm/i915: Remove dead update_wm_pre assignment from SKL wm code) 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 (dd1bdbcb777d drm/msm: add headless gpu device for imx5) CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/hdmi/hdmi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/adreno/a5xx_gpu.c 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 (99e294492ef9 drm/etnaviv: Replace drm_dev_unref with drm_dev_put) CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_drv.c Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (52d613b36fb7 Merge remote-tracking branch 'regmap/topic/irq' into regmap-next) Merging sound/for-next (e854747d7593 ALSA: hda/realtek - Enable headset button support for new codec) Merging sound-asoc/for-next (57fe9b91fc4a Merge branch 'asoc-4.21' into asoc-next) Merging modules/modules-next (2d25bc552353 module: make it clearer when we're handling kallsyms symbols vs exported symbols) Merging input/next (0832e93632c6 Input: rotary-encoder - don't log EPROBE_DEFER to kernel log) Merging block/for-next (cfa4885ae990 Merge branch 'for-4.21/libata' into for-next) Merging device-mapper/for-next (417cb6275b77 dm verity: log the hash algorithm implementation) CONFLICT (content): Merge conflict in block/bio.c Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) Merging mmc/next (43cee3e27ea0 sh: ecovec24: Fix an ifdef) 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 (5391ad18eddb mfd: axp20x: Add AC power supply cell for AXP813) Merging backlight/for-backlight-next (61170ee93868 backlight: pwm_bl: Fix devicetree parsing with auto-generated brightness tables) Merging battery/for-next (4a040e7c72e6 power: supply: sc27xx: Save last battery capacity) Merging regulator/for-next (f00e93a1224f Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next) Merging security/next-testing (26b76320a8a5 Merge tag 'v4.20-rc2' into next-general) Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute) Merging integrity/next-integrity (6cb1d5f9b5ac ima: Support platform keyring for kernel appraisal) Merging selinux/next (ee1a84fdfeed selinux: overhaul sidtab to fix bug and improve performance) CONFLICT (content): Merge conflict in security/selinux/hooks.c Merging tpmdd/next (8f82ffbc5b0b tpm: add support for partial reads) Merging watchdog/master (31eb42bd9353 watchdog: w83627hf_wdt: Add quirk for Inves system) Merging iommu/next (8c1ecb2dd889 Merge branches 'arm/renesas', 'arm/mediatek', 'arm/tegra', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (104c7405a64d vfio: add edid support to mbochs sample driver) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (9a547c7e575f audit: shorten PATH cap values when zero) Merging devicetree/for-next (66fe674690e1 Merge branch 'yaml-bindings-for-v4.21' into dt/next) Merging mailbox/mailbox-for-next (9f0a0a381c5d mailbox: mediatek: Add check for possible failure of kzalloc) Merging spi/for-next (90d467229dee Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next) Merging tip/auto-latest (0b02d688ca73 Merge branch 'x86/urgent') CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/resctrl/rdtgroup.c Merging clockevents/clockevents/next (ded414ebcd58 clocksource/drivers/fttmr010: Fix invalid interrupt register access) Merging edac-amd/for-next (8a880560d58a MAINTAINERS, EDAC: Drop bouncing email) Merging irqchip/irq/irqchip-next (2130b789b3ef irqchip/gic: Unify GIC priority definitions) Merging ftrace/for-next (50432fa18c3d selftests/ftrace: Add testcases for dynamic event) Merging rcu/rcu/next (06aa5694f870 Merge LKMM and RCU commits) 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 MAINTAINERS Merging kvm/linux-next (22a7cdcae6a4 KVM/nVMX: Do not validate that posted_intr_desc_addr is page aligned) Merging kvm-arm/next (e4e11cc0f81e KVM: arm64: Safety check PSTATE when entering guest and handle IL) Merging kvm-ppc/kvm-ppc-next (651022382c7f Linux 4.20-rc1) 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 (975ef94a0284 pvcalls-front: fixes incorrect error handling) 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 (f25b6302b294 platform/x86: touchscreen_dmi: Add info for the Mediacom Flexbook Edge 11) 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 (cb14e6d6d8f4 leds: pwm: Use OF variant of LED registering function) 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 (e67ebf1b3815 xhci: move usb2 get port status link resume handling to its own function) Merging usb-gadget/next (d53701067f04 usb: dwc3: gadget: check if dep->frame_number is still valid) Merging usb-serial/usb-next (32899682cf45 USB: serial: mos7840: add a product ID for the new product) Merging usb-chipidea-next/ci-for-usb-next (59739131e0ca usb: chipidea: Fix otg event handler) Merging phy-next/next (013231475e12 phy: dphy: Add configuration helpers) Merging tty/tty-next (1528e40fd7d3 Revert "sysctl: clean up nr_pdflush_threads leftover") Merging char-misc/char-misc-next (48d365de7746 Merge tag 'soundwire-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next) CONFLICT (content): Merge conflict in drivers/misc/Makefile CONFLICT (content): Merge conflict in drivers/hv/channel_mgmt.c 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 (7146a4f02635 staging: erofs: simplify `z_erofs_vle_submit_all') 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 (2b4b64840d7f Merge branch 'topic/fsl' into next) Merging cgroup/for-next (87f902fab430 Merge branch 'for-4.21' into for-next) Merging scsi/for-next (95150405e108 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (de55b786b8a6 scsi: lpfc: update driver version to 12.0.0.9) CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c 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 (9555fbf0b887 Merge branch 'devel' into for-next) $ git reset --hard HEAD^ Merging next-20181207 version of gpio Merging pinctrl/for-next (7d70d9e39bd0 Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1) Merging pwm/for-next (f82d15e22340 pwm: lpc18xx-sct: Don't reconfigure PWM in .request and .free) 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 (1d956785da55 selftests/ftrace: Fix invalid SPDX identifiers) Merging y2038/y2038 (ccea641b6742 timekeeping: remove obsolete time accessors) Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next) Merging coresight/next (7ff8957175d6 coresight: Use of_node_name_eq for node name comparisons) Merging rtc/rtc-next (8c4cf161a8b4 dt-bindings: rtc: sun6i-rtc: Fix register range in example) Merging nvdimm/libnvdimm-for-next (594861215c83 acpi, nfit: Further restrict userspace ARS start requests) Merging at24/at24/for-next (9ff01193a20d Linux 4.20-rc3) Merging ntb/ntb-next (651022382c7f Linux 4.20-rc1) Merging kspp/for-next/kspp (8fb2dfb228df stackleak: Register the 'stackleak_cleanup' pass before the '*free_cfg' pass) 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 (4f145cd66a1a XArray tests: Check iterating over multiorder entries) Merging akpm-current/current (59914d7a892f ipc: conserve sequence numbers in extended IPCMNI mode) CONFLICT (content): Merge conflict in arch/powerpc/mm/pgtable-book3s64.c CONFLICT (content): Merge conflict in arch/powerpc/include/asm/nohash/32/pgalloc.h CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/32/pgalloc.h Applying: mm: fix for "stall movable allocations until kswapd progresses during serious external fragmentation event" Applying: fix up for "mm: treewide: remove unused address argument from pte_alloc functions" $ git checkout -b akpm remotes/origin/akpm/master Applying: scripts/atomic/check-atomics.sh: don't assume that scripts are executable Applying: kernel/signal.c: remove some duplicated includes Applying: kernel/signal.c: remove some duplicated includes Applying: locking/atomics: build atomic headers as required Applying: mm: Introduce common STRUCT_PAGE_MAX_SHIFT define Applying: mm/sparse: add common helper to mark all memblocks present 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: mm-convert-pg_balloon-to-pg_offline-fix-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: lib/lzo: tidy-up ifdefs Applying: lib/lzo: clean-up by introducing COPY16 Applying: lib/lzo: enable 64-bit CTZ on Arm Applying: lib/lzo: 64-bit CTZ on arm64 Applying: lib/lzo: fast 8-byte copy on arm64 Applying: lib/lzo: implement run-length encoding Applying: lib-lzo-implement-run-length-encoding-v4.txt Applying: lib/lzo: separate lzo-rle from lzo Applying: lib-lzo-separate-lzo-rle-from-lzo-v4 Applying: zram: default to lzo-rle instead of lzo 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/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Merging akpm/master (f1388414a36d drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgpxrij7Mx8yr.pgp
Description: OpenPGP digital signature
