Hi all, Changes since 20200217: The amlogic tree still had its build failure so I used a supplied patch. The imx-mxs tree gained a build failure for which I reverted a commit. The akpm-current tree still had its build failure for which I reverted a series of commits. Non-merge commits (relative to Linus' tree): 2413 2206 files changed, 83904 insertions(+), 65337 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 htmldocs. 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 315 trees (counting Linus' and 78 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 (11a48a5a18c6 Linux 5.6-rc2) Merging fixes/master (ba954bf6cb38 evh_bytechan: fix out of bounds accesses) Merging kbuild-current/fixes (743de36e106d kbuild: add comment for V=2 mode) Merging arc-current/for-curr (0acdf63d2296 ARC: fpu: fix randconfig build error reported by 0-day test service) Merging arm-current/fixes (6849b5eba196 ARM: 8955/1: virt: Relax arch timer version check during early boot) Merging arm-soc-fixes/arm/fixes (3bf3c9744694 bus: moxtet: fix potential stack buffer overflow) Merging arm64-fixes/for-next/fixes (d91771848f0a arm64: time: Replace <linux/clk-provider.h> by <linux/of_clk.h>) Merging m68k-current/for-linus (6aabc1facdb2 m68k: Implement copy_thread_tls()) Merging powerpc-fixes/fixes (d4bf905307a1 powerpc: Fix CONFIG_TRACE_IRQFLAGS with CONFIG_VMAP_STACK) Merging s390-fixes/fixes (94e90f727f74 s390: make 'install' not depend on vmlinux) Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (9a6a0dea1617 net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()) Merging bpf/master (e20d3a055a45 bpf, offload: Replace bitwise AND by logical AND in bpf_prog_offload_info_fill) Merging ipsec/master (a1a7e3a36e01 xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire) Merging netfilter/master (a7da92c2c8a1 netfilter: flowtable: skip offload setup if disabled) Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs) Merging wireless-drivers/master (a9149d243f25 iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices) Merging mac80211/master (9a6a0dea1617 net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt()) Merging rdma-fixes/for-rc (685eff513183 IB/mlx5: Use div64_u64 for num_var_hw_entries calculation) Merging sound-current/for-linus (a655e2b107d4 ALSA: hda/realtek - Apply quirk for MSI GP63, too) Merging sound-asoc-fixes/for-linus (d7aa029b173b Merge branch 'asoc-5.6' into asoc-linus) Merging regmap-fixes/for-linus (bb6d3fb354c5 Linux 5.6-rc1) Merging regulator-fixes/for-linus (e361130b31aa Merge branch 'regulator-5.6' into regulator-linus) Merging spi-fixes/for-linus (db33c6a8314b Merge branch 'spi-5.6' into spi-linus) Merging pci-current/for-linus (bb6d3fb354c5 Linux 5.6-rc1) Merging driver-core.current/driver-core-linus (ae91c9256549 debugfs: remove return value of debugfs_create_regset32()) Merging tty.current/tty-linus (07e6124a1a46 vt: selection, close sel_buffer race) Merging usb.current/usb-linus (bab5417f5f01 USB: misc: iowarrior: add support for the 100 device) Merging usb-gadget-fixes/fixes (42cd5ffe46c1 usb: dwc3: debug: fix string position formatting mixup with ret and len) Merging usb-serial-fixes/usb-linus (7c3d02285ad5 USB: serial: ch341: fix receiver regression) Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) Merging phy/fixes (4f510aa10468 phy/rockchip: inno-hdmi: round clock rate down to closest 1000 Hz) Merging staging.current/staging-linus (9a4556bd8f23 staging: rtl8723bs: Remove unneeded goto statements) Merging char-misc.current/char-misc-linus (74ba569a15a0 Merge tag 'misc-habanalabs-fixes-2020-02-11' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus) Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging thunderbolt-fixes/fixes (da0f3e0201b8 MAINTAINERS: Sort entries in database for THUNDERBOLT) Merging input-current/for-linus (3dbae1553897 Input: cyapa - replace zero-length array with flexible-array member) Merging crypto-current/master (c9cc0517bba9 crypto: chacha20poly1305 - prevent integer overflow on large input) Merging ide/master (94f2630b1897 Merge tag '5.6-rc-small-smb3-fix-for-stable' of git://git.samba.org/sfrench/cifs-2.6) Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base) Merging kselftest-fixes/fixes (9a0584f05687 selftests: openat2: fix build error on newer glibc) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging slave-dma-fixes/fixes (2227ab4216cd dmaengine: idxd: Fix error handling in idxd_wq_cdev_dev_setup()) Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) Merging mtd-fixes/mtd/fixes (def9d2780727 Linux 5.5-rc7) Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core) Merging v4l-dvb-fixes/fixes (1697d9812481 media: staging/intel-ipu3: remove TODO item about acronyms) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (bef8e2dfceed MIPS: VPE: Fix a double free and a memory leak in 'release_vpe()') Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) Merging omap-fixes/fixes (b0b039515445 ARM: dts: am43x-epos-evm: set data pin directions for spi0 and spi1) Merging kvm-fixes/master (ead68df94d24 KVM: x86: enable -Werror) Merging kvms390-fixes/master (fe33a928bfcd KVM: s390: ENOTSUPP -> EOPNOTSUPP fixups) Merging hwmon-fixes/hwmon (11a48a5a18c6 Linux 5.6-rc2) Merging nvdimm-fixes/libnvdimm-fixes (96222d53842d dax: pass NOWAIT flag to iomap_apply) Merging btrfs-fixes/next-fixes (c4ebce2b0e30 Merge branch 'misc-5.6' into next-fixes) Merging vfs-fixes/fixes (d0cb50185ae9 do_last(): fetch directory ->i_mode and ->i_uid before it's too late) Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU) Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) Merging drivers-x86-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging samsung-krzk-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging devicetree-fixes/dt/linus (04dbd86539fd dt-bindings: Fix paths in schema $id fields) Merging scsi-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging drm-fixes/drm-fixes (11a48a5a18c6 Linux 5.6-rc2) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (dc35d7955e72 HACK: Revert "ACPI: PM: s2idle: Avoid possible race related to the EC GPE") Merging mmc-fixes/fixes (9051db381fab mmc: sdhci-msm: Mark sdhci_msm_cqe_disable static) Merging rtc-fixes/rtc-fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging gnss-fixes/gnss-linus (bb6d3fb354c5 Linux 5.6-rc1) Merging hyperv-fixes/hyperv-fixes (af42d3466bdc Linux 5.4-rc8) Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request()) Merging risc-v-fixes/fixes (def9d2780727 Linux 5.5-rc7) Merging pidfd-fixes/fixes (0bef168e8859 exit: Fix Sparse errors and warnings) Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio) Merging spdx/spdx-linus (bb6d3fb354c5 Linux 5.6-rc1) Merging gpio-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging pinctrl-intel-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging erofs-fixes/fixes (d1eef1c61974 Linux 5.5-rc2) Merging drm-misc-fixes/for-linux-next-fixes (dde2bb2da01e drm/panfrost: perfcnt: Reserve/use the AS attached to the perfcnt MMU context) Merging kspp-gustavo/for-next/kspp (bb6d3fb354c5 Linux 5.6-rc1) Merging kbuild/for-next (0bf999f9c5e7 linux/pipe_fs_i.h: fix kernel-doc warnings after @wait was split) Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (75467ee48a5e dma-direct: improve DMA mask overflow reporting) Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (29cd07a400ae Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (e533dbe9dcb1 arm64: acpi: fix DAIF manipulation with pNMI) Merging arm-perf/for-next/perf (8703317ae576 drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform) Merging arm-soc/for-next (f07849b2ac77 ARM: Document merges) Merging amlogic/for-next (7ef59ea6bce0 Merge branch 'v5.7/drivers' into tmp/aml-rebuild) Applying: soc: amlogic: fix compile failure with MESON_SECURE_PM_DOMAINS & !MESON_SM Merging aspeed/for-next (5a020d80bbef ARM: dts: aspeed: g4: add video engine support) Merging at91/at91-next (1bf257001079 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next) Merging imx-mxs/for-next (eb63d5e07b53 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (a1766a49fc90 Merge tag 'drivers_soc_for_5.6' into next) Merging mediatek/for-next (faf3024a8ea2 Merge branch 'v5.6-next/soc' into for-next) Merging mvebu/for-next (c0d03b53ef47 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (f9f5267ec296 Merge branch 'omap-for-v5.6/dt' into for-next) Merging qcom/for-next (bc50f20a31b1 Merge branches 'arm64-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next) Merging realtek/for-next (45698e00d5a9 Merge branch 'v5.6/dt' into next) Merging renesas/next (c3f5f82f4dfc Merge branches 'renesas-arm-soc-for-v5.7' and 'renesas-drivers-for-v5.7' into renesas-next) Merging reset/reset/next (4e0b9bc98c4a dt-bindings: reset: meson: add gxl internal dac reset) Merging rockchip/for-next (152f9a049efc Merge branch 'v5.6-clk/fixes' into for-next) Merging samsung-krzk/for-next (735478fc8a89 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (11a48a5a18c6 Linux 5.6-rc2) Merging sunxi/sunxi/for-next (8033917515c7 Merge branches 'sunxi/clk-for-5.7', 'sunxi/core-for-5.7' and 'sunxi/dt-for-5.7' into sunxi/for-next) Merging tegra/for-next (108f7e5e9478 Merge branch for-5.6/clk into for-next) Merging clk/clk-next (931cfff0458a Merge branch 'clk-socfpga' into clk-next) Merging clk-samsung/for-next (54ecb8f7028c Linux 5.4-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 (85ea1329d674 csky: Replace <linux/clk-provider.h> by <linux/of_clk.h>) Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h) Merging ia64/next (240b62d381fe ia64: remove stale paravirt leftovers) Merging m68k/for-next (dff527e7a0a8 m68k: Switch to asm-generic/hardirq.h) Merging m68knommu/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging microblaze/next (6aa71ef9bcf9 microblaze: Add ID for Microblaze v11) Merging mips/mips-next (2c4288719806 MIPS: PCI: Add detection of IOC3 on IO7, IO8, IO9 and Fuel) Merging nds32/next (a7f96fce201c MAINTAINERS: add nds32 maintainer) Merging nios2/for-next (051d75d3bb31 MAINTAINERS: Update Ley Foon Tan's email address) Merging openrisc/for-next (fc74d7166005 openrisc: use mmgrab) Merging parisc-hd/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging powerpc/next (71c3a888cbca Merge tag 'powerpc-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) Merging soc-fsl/next (6e62bd36e9ad soc: fsl: qe: remove set but not used variable 'mm_gc') Merging risc-v/for-next (b2389902f6fd riscv: Use flush_icache_mm for flush_icache_user_range) 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 (c4f762ff6b77 s390/zcrypt: Support for CCA protected key block version 2) Merging sh/sh-next (a193018e5290 sh: add missing EXPORT_SYMBOL() for __delay) Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging uml/linux-next (d65197ad5249 um: Fix time-travel=inf-cpu with xor/raid6) Merging xtensa/xtensa-for-next (362961f4063f Merge branch 'xtensa-5.6-fixes' into xtensa-for-next) Merging fscrypt/master (edc440e3d27f fscrypt: improve format of no-key names) Merging afs/afs-next (4fe171bb81b1 afs: Remove set but not used variable 'ret') Merging btrfs/for-next (455808a18dbf Merge branch 'for-next-next-v5.6-20200211' into for-next-20200211) Merging ceph/master (3b20bc2fe4c0 ceph: noacl mount option is effectively ignored) Merging cifs/for-next (0fc6b1c269d1 cifs: plumb smb2 POSIX dir enumeration) Merging configfs/for-next (e2f238f7d5a1 configfs: calculate the depth of parent item) Merging ecryptfs/next (2c2a7552dd64 ecryptfs: replace BUG_ON with error handling code) Merging erofs/dev (bb6d3fb354c5 Linux 5.6-rc1) Merging ext3/for_next (daf1cd925487 Pull macro cleanup patches.) Merging ext4/dev (c96dceeabf76 jbd2: do not clear the BH_Mapped flag when forgetting a metadata buffer) Merging f2fs/dev (b19e8c684703 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) Merging fsverity/fsverity (da3a3da4e6c6 fs-verity: use u64_to_user_ptr()) Merging fuse/for-next (3e8cb8b2eaeb fuse: fix stack use after return) Merging jfs/jfs-next (802a5017ffb2 jfs: remove unused MAXL2PAGES) Merging nfs/linux-next (11a48a5a18c6 Linux 5.6-rc2) Merging nfs-anna/linux-next (5d63944f8206 NFSv4: Ensure the delegation cred is pinned when we call delegreturn) Merging nfsd/nfsd-next (3d96208c30f8 sunrpc: expiry_time should be seconds not timeval) Merging orangefs/for-next (9f198a2ac543 help_next should increase position index) Merging overlayfs/overlayfs-next (a4ac9d45c0cd ovl: fix lseek overflow on 32bit) Merging ubifs/linux-next (fe357dbae113 ubi: Fix an error pointer dereference in error handling code) Merging v9fs/9p-next (79fb9216b7be 9p: Remove unneeded semicolon) Merging xfs/for-next (cdbcf82b86ea xfs: fix xfs_buf_ioerror_alert location reporting) Merging zonefs/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging iomap/iomap-for-next (243145bc4336 fs: Fix page_mkwrite off-by-one errors) Merging djw-vfs/vfs-for-next (3253d9d09337 splice: only read in as much information as there is pipe buffer space) Merging file-locks/locks-next (98ca480a8f22 locks: print unsigned ino in /proc/locks) Merging vfs/for-next (0fd169576648 fs: Add VirtualBox guest shared folder (vboxsf) support) Merging printk/for-next (f93598b8c76f Merge branch 'for-5.7' into for-next) Merging pci/next (bb6d3fb354c5 Linux 5.6-rc1) Merging pstore/for-next/pstore (e163fdb3f7f8 pstore/ram: Regularize prz label allocation lifetime) Merging hid/for-next (9d7e22b27ba7 Merge branch 'for-5.6/upstream-fixes' into for-next) Merging i2c/i2c/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging i3c/i3c/next (3952cf8ff2f7 i3c: master: dw: reattach device on first available location of address table) Merging dmi/master (6eaaa9e89719 firmware/dmi: Report DMI Bios & EC firmware release) Merging hwmon-staging/hwmon-next (42db9602a033 hwmon: (pmbus/tps53679) Add documentation) Merging jc_docs/docs-next (2e5b1886e9ba Documentation: bootconfig: fix Sphinx block warning) Merging v4l-dvb/master (bb6d3fb354c5 Linux 5.6-rc1) Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (00b838d60ec4 Merge branch 'pm-qos' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (a30f8a91f3c2 cpufreq: imx-cpufreq-dt: Add "cpu-supply" property check) Merging cpupower/cpupower (bb6d3fb354c5 Linux 5.6-rc1) Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter) Merging thermal/thermal/linux-next (eefb85077bfe ARM: configs: Build BCM2711 thermal as module) CONFLICT (add/add): Merge conflict in Documentation/driver-api/thermal/cpu-idle-cooling.rst CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor) Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid') Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions) Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region()) Merging rdma/for-next (beb205dd67aa RDMA/siw: Fix setting active_mtu attribute) Merging net-next/master (92df9f8a745e Merge branch 'mvneta-xdp-ethtool-stats') Merging bpf-next/master (92df9f8a745e Merge branch 'mvneta-xdp-ethtool-stats') Merging ipsec-next/master (9f68e3655aae Merge tag 'drm-next-2020-01-30' of git://anongit.freedesktop.org/drm/drm) Merging mlx5-next/mlx5-next (bb6d3fb354c5 Linux 5.6-rc1) Merging netfilter-next/master (fdfa3a6778b1 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook) Merging wireless-drivers-next/master (932183aa35c6 mwifiex: change license text from MARVELL to NXP) Merging bluetooth/master (e22998f53a1e Bluetooth: Fix a typo in Kconfig) Merging mac80211-next/master (92df9f8a745e Merge branch 'mvneta-xdp-ethtool-stats') Merging gfs2/for-next (6e5e41e2dc4e gfs2: fix O_SYNC write handling) Merging mtd/mtd/next (4575243c5c17 Merge tag 'nand/for-5.6' into mtd/next) Merging nand/nand/next (d85339d9ea26 mtd: onenand: Rename omap2 driver to avoid a build warning) Merging spi-nor/spi-nor/next (8c79fa6c44de mtd: spi-nor: introduce SR_BP_SHIFT define) Merging crypto/master (7f19380b2cfd crypto: qce - handle AES-XTS cases that qce fails) Merging drm/drm-next (bb6d3fb354c5 Linux 5.6-rc1) Merging amdgpu/drm-next (05b5ff30d31f drm/amdgpu: drop legacy drm load and unload callbacks) Merging drm-intel/for-linux-next (8d6cae6fcde8 drm/i915/selftests: Mark the mock ring->vma as being in the GGTT) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scheduler.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_request.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/selftest_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/mock_engine.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_context.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c Merging drm-tegra/drm/tegra/for-next (98ae41adb252 gpu: host1x: Set DMA direction only for DMA-mapped buffer objects) Merging drm-misc/for-linux-next (e1cf35b94c5f drm/edid: fix building error) Merging drm-msm/msm-next (5f9935f514d6 drm/msm: Fix error about comments within a comment block) Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500) Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary) Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells) Merging regmap/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging sound/for-next (2948f4a4e583 Merge branch 'topic/usb-uac2-effect-unit' into for-next) Merging sound-asoc/for-next (71d811152239 Merge branch 'asoc-5.7' into asoc-next) Merging modules/modules-next (0f74226649fb kernel: module: Replace zero-length array with flexible-array member) Merging input/next (c5ccf2ad3d33 Input: synaptics-rmi4 - switch to reduced reporting mode) Merging block/for-next (6b6eb301e976 Merge branch 'io_uring-5.6' into for-next) Merging device-mapper/for-next (47ace7e012b9 dm: fix potential for q->make_request_fn NULL pointer) Merging pcmcia/pcmcia-next (71705c611263 PCMCIA/i82092: remove #if 0 block) Merging mmc/next (84f371938735 Merge branch 'fixes' into next) Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) Merging mfd/for-mfd-next (5312f321a67c mfd: syscon: Fix syscon_regmap_lookup_by_phandle_args() dummy) Merging backlight/for-backlight-next (7af43a76695d backlight: qcom-wled: Fix unsigned comparison to zero) Merging battery/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging regulator/for-next (5932ad6367d1 Merge branch 'regulator-5.7' into regulator-next) Merging security/next-testing (10c2d111c906 security: remove EARLY_LSM_COUNT which never used) Merging apparmor/apparmor-next (01df52d726b5 apparmor: remove duplicate check of xattrs on profile attachment.) Merging integrity/next-integrity (d54e17b40666 Merge branch 'next-integrity.defer-measuring-keys' into next-integrity) Merging keys/keys-next (bda7978b1956 Merge branch 'keys-acl' into keys-next) Merging selinux/next (253050f57c7a selinux: factor out loop body from filename_trans_read()) CONFLICT (content): Merge conflict in security/selinux/ss/services.c CONFLICT (content): Merge conflict in security/selinux/include/security.h CONFLICT (content): Merge conflict in security/selinux/hooks.c Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock) Merging tomoyo/master (bb6d3fb354c5 Linux 5.6-rc1) Merging tpmdd/next (dc10e4181c05 tpm: Initialize crypto_id of allocated_banks to HASH_ALGO__LAST) Merging watchdog/master (44144c809e39 watchdog: da9062: Add dependency on I2C) Merging iommu/next (e3b5ee0cfb65 Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next) Merging vfio/next (7b5372ba04ca vfio: platform: fix __iomem in vfio_platform_amdxgbe.c) Merging audit/next (70b3eeed49e8 audit: CONFIG_CHANGE don't log internal bookkeeping as an event) Merging devicetree/for-next (90aeca875f8a dt-bindings: display: Convert etnaviv to json-schema) CONFLICT (modify/delete): Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt left in tree. $ git rm -f Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt Merging mailbox/mailbox-for-next (c6c6bc6ea9fc mailbox: imx: add support for imx v1 mu) Merging spi/for-next (7b3bbd9f82f2 Merge branch 'spi-5.7' into spi-next) Merging tip/auto-latest (fc822da1328e Merge branch 'core/objtool') Merging clockevents/timers/drivers/next (e4c3b4213b79 clocksource/hyperv: Set TSC clocksource as default w/ InvariantTSC) Merging edac/edac-for-next (4aa92c864632 EDAC/mc: Remove per layer counters) Merging irqchip/irq/irqchip-next (5186a6cc3ef5 irqchip/gic-v3-its: Rename VPENDBASER/VPROPBASER accessors) Merging ftrace/for-next (7276531d4036 tracing: Consolidate trace() functions) Merging rcu/rcu/next (2de7463235f0 rcu: Don't use negative nesting depth in __rcu_read_unlock()) Merging kvm/linux-next (ead68df94d24 KVM: x86: enable -Werror) Merging kvm-arm/next (b3f15ec3d809 kvm: arm/arm64: Fold VHE entry/exit work into kvm_vcpu_run_vhe()) Merging kvm-ppc/kvm-ppc-next (fd24a8624eb2 KVM: PPC: Book3S PR: Fix -Werror=return-type build failure) Merging kvms390/next (b35e8878e1d3 KVM: s390/interrupt: do not pin adapter interrupt pages) Merging xen-tip/linux-next (8557bbe5156e xen/blkback: Consistently insert one empty line between functions) Merging percpu/for-next (9391e7a9a1e2 Merge branch 'for-5.6' into for-next) Merging workqueues/for-next (1cd27003497a workqueue: don't use wq_select_unbound_cpu() for bound works) Merging drivers-x86/for-next (7adb1e8aeeb5 platform/x86: intel_pmc_core: Add debugfs support to access live status registers) Merging chrome-platform/for-next (42cd0ab476e2 platform/chrome: cros_ec: Query EC protocol version if EC transitions between RO/RW) Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging leds/for-next (11a48a5a18c6 Linux 5.6-rc2) Merging ipmi/for-next (7342db125413 drivers: char: ipmi: ipmi_msghandler: Pass lockdep expression to RCU lists) Merging driver-core/driver-core-next (99c73ce158a4 drivers base/arch_topology: Reformat topology_get_[cpu/freq]_scale() function name) Merging usb/usb-next (b57a368efde6 usb: gadget: f_phonet: Replace zero-length array with flexible-array member) Merging usb-gadget/next (bb6d3fb354c5 Linux 5.6-rc1) Merging usb-serial/usb-next (2c0bee081315 USB: serial: digi_acceleport: remove redundant assignment to pointer priv) Merging usb-chipidea-next/ci-for-usb-next (4d6141288c33 usb: chipidea: imx: pinctrl for HSIC is optional) Merging phy-next/next (a5c86c557fe9 phy: mapphone-mdm6600: Fix write timeouts with shorter GPIO toggle interval) Merging tty/tty-next (643f7d95fe23 serial: core: use octal permissions on module param) Merging char-misc/char-misc-next (06e33595e96f misc: Use kzalloc() instead of kmalloc() with flag GFP_ZERO.) Merging extcon/extcon-next (bbbd323cf9e7 extcon: Remove unneeded extern keyword from extcon-provider.h) Merging soundwire/next (bfaa3549541c soundwire: stream: don't program ports when a stream that has not been prepared) Merging thunderbolt/next (3084ea9ea889 thunderbolt: icm: Replace zero-length array with flexible-array member) Merging staging/staging-next (b1f17561541c staging: wilc1000: define macros to replace magic number values) CONFLICT (content): Merge conflict in MAINTAINERS Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (bb6d3fb354c5 Linux 5.6-rc1) Merging slave-dma/next (acd624185d20 dmaengine: ti: dma-crossbar: convert to devm_platform_ioremap_resource()) Merging cgroup/for-next (9bd5910d7f3d selftests/cgroup: add tests for cloning into cgroups) Merging scsi/for-next (145e5a8a5cbd scsi: lpfc: Copyright updates for 12.6.0.4 patches) Merging scsi-mkp/for-next (145e5a8a5cbd scsi: lpfc: Copyright updates for 12.6.0.4 patches) Merging vhost/linux-next (370e2c82a4a5 vhost: use batched version by default) Merging rpmsg/for-next (5a87e60312a9 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (53803ecac78b Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (cb548e981da5 gpiolib: Rename 'event' to 'ge' to be consistent with other use) Merging gpio-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging pinctrl/for-next (c93214689f0c MAINTAINERS: Sort entries in database for PIN CONTROLLER) Merging pinctrl-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging pinctrl-samsung/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging pwm/for-next (9871abffc810 pwm: Remove set but not set variable 'pwm') Merging userns/for-next (61a47c1ad3a4 sysctl: Remove the sysctl system call) Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig) Merging random/dev (4cb760b02419 s390x: Mark archrandom.h functions __must_check) Merging kselftest/next (3032e3a7c7e3 selftests/resctrl: Add the test in MAINTAINERS) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") Merging livepatching/for-next (d28b4c1b2b3d Merge branch 'for-5.6/selftests' into for-next) Merging coresight/next (bb6d3fb354c5 Linux 5.6-rc1) Merging rtc/rtc-next (4594d082dbe6 rtc: zynqmp: Clear alarm interrupt status before interrupt enable) Merging nvdimm/libnvdimm-for-next (46cf053efec6 Linux 5.5-rc3) Merging at24/at24/for-next (4837621cd61e eeprom: at24: add TPF0001 ACPI ID for 24c1024 device) Merging ntb/ntb-next (1ef512b16bc8 NTB: Fix an error in get link status) Merging kspp/for-next/kspp (c79f46a28239 Linux 5.5-rc5) Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) Merging gnss/gnss-next (bb6d3fb354c5 Linux 5.6-rc1) Merging fsi/next (2c01397b71c5 fsi: aspeed: Fix OPB0 byte order register values) CONFLICT (content): Merge conflict in drivers/fsi/Kconfig Merging slimbus/for-next (526eaf5d08a2 slimbus: Use the correct style for SPDX License Identifier) Merging nvmem/for-next (e44b9b8b2c57 nvmem: core: add nvmem_cell_read_u64) Merging xarray/xarray (3a00e7c47c38 ida: remove abandoned macros) Merging hyperv/hyperv-next (54e19d34011f hv_utils: Add the support of hibernation) Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1) Merging kgdb/kgdb/for-next (fcf2736c82ca Revert "kdb: Get rid of confusing diag msg from "rd" if current task has no regs") Merging pidfd/for-next (8d19f1c8e193 prctl: PR_{G,S}ET_IO_FLUSHER to support controlling memory reclaim) Merging devfreq/devfreq-next (a454401a57ed PM / devfreq: Change to DEVFREQ_GOV_UPDATE_INTERVAL event name) Merging hmm/hmm (bb6d3fb354c5 Linux 5.6-rc1) Merging fpga/for-next (28910cee898c fpga: xilinx-pr-decoupler: Remove clk_get error message for probe defer) Merging kunit/test (bb6d3fb354c5 Linux 5.6-rc1) Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6) Merging kasan-bitops/topic/kasan-bitops (4f4afc2c9599 docs/core-api: Remove possibly confusing sub-headings from Bit Operations) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) Merging kunit-next/kunit (e20d8e81a0e0 Documentation: kunit: fixed sphinx error in code block) Applying: Revert "soc: imx: increase build coverage for imx8m soc driver" Merging akpm-current/current (5b957e5ca736 init/Kconfig: clean up ANON_INODES and old IO schedulers options) CONFLICT (content): Merge conflict in arch/m68k/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/csky/include/asm/Kbuild Applying: Revert "net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix" Applying: Revert "net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy" Applying: Revert "add missing page_count() check to vm_insert_pages()." Applying: Revert "mm-add-vm_insert_pages-fix" Applying: Revert "mm/memory.c: add vm_insert_pages()" $ git checkout -b akpm remotes/origin/akpm/master Applying: mm/frontswap: mark various intentional data races Applying: mm/page_io: mark various intentional data races Applying: mm-page_io-mark-various-intentional-data-races-v2 Applying: mm/swap_state: mark various intentional data races Applying: mm/kmemleak: annotate various data races obj->ptr Applying: mm/filemap.c: fix a data race in filemap_fault() Applying: mm/swapfile: fix and annotate various data races Applying: mm-swapfile-fix-and-annotate-various-data-races-v2 Applying: mm/page_counter: fix various data races at memsw Applying: mm/memcontrol: fix a data race in scan count Applying: mm/list_lru: fix a data race in list_lru_count_one Applying: mm/mempool: fix a data race in mempool_free() Applying: mm/util.c: annotate an data race at vm_committed_as Applying: mm/rmap: annotate a data race at tlb_flush_batched Applying: drivers/tty/serial/sh-sci.c: suppress warning Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow Merging akpm/master (d445fed97103 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgpQDsLNL395E.pgp
Description: OpenPGP digital signature
