Hi all, Changes since 20200302: The thermal tree gained a build failure for which I applied a patch. The jc_docs tree gained a conflict against Linus' tree. The netfilter-next tree gained a conflict against Linus' tree. The akpm tree lost its build failure. Non-merge commits (relative to Linus' tree): 5166 5036 files changed, 192290 insertions(+), 104435 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 314 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 (98d54f81e36b Linux 5.6-rc4) Merging fixes/master (eb239a5f369f evh_bytechan: fix out of bounds accesses) Merging kbuild-current/fixes (29795de0d242 Merge tag 'pci-v5.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) Merging arc-current/for-curr (3b00b042eeaa ARC: Replace <linux/clk-provider.h> by <linux/of_clk.h>) Merging arm-current/fixes (89604523a76e ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin) Merging arm-soc-fixes/arm/fixes (0b86b258e644 Merge tag 'arm-soc/for-5.6/defconfig-fixes' of https://github.com/Broadcom/stblinux into arm/fixes) Merging arm64-fixes/for-next/fixes (9abd515a6e4a arm64: context: Fix ASID limit in boot messages) Merging m68k-current/for-linus (6aabc1facdb2 m68k: Implement copy_thread_tls()) Merging powerpc-fixes/fixes (cb0cc635c7a9 powerpc: Include .BTF section) Merging s390-fixes/fixes (f8788d86ab28 Linux 5.6-rc3) Merging sparc/master (11648b8339f8 sparc64: fix adjtimex regression) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (249bc9744e16 net: phy: avoid clearing PHY interrupts twice in irq handler) Merging bpf/master (542bf38f11d1 mailmap: Update email address) Merging ipsec/master (edf0d283d988 ipv6: xfrm6_tunnel.c: Use built-in RCU list checking) Merging netfilter/master (249bc9744e16 net: phy: avoid clearing PHY interrupts twice in irq handler) 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 (3614d05b5e6b Merge tag 'mac80211-for-net-2020-02-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging rdma-fixes/for-rc (6affca140cbe RDMA/rw: Fix error flow during RDMA context initialization) Merging sound-current/for-linus (c37c0ab02956 ALSA: hda/realtek - Fix a regression for mute led on Lenovo Carbon X1) Merging sound-asoc-fixes/for-linus (4dd668e24352 Merge branch 'asoc-5.6' into asoc-linus) Merging regmap-fixes/for-linus (d29456d34def Merge branch 'regmap-5.6' into regmap-linus) Merging regulator-fixes/for-linus (3faf4b10a16c Merge branch 'regulator-5.6' into regulator-linus) Merging spi-fixes/for-linus (ccad73a0788e Merge branch 'spi-5.6' into spi-linus) Merging pci-current/for-linus (5901b51f3e5d MAINTAINERS: Correct Cadence PCI driver path) Merging driver-core.current/driver-core-linus (ae91c9256549 debugfs: remove return value of debugfs_create_regset32()) Merging tty.current/tty-linus (e8c75a30a23c vt: selection, push sel_lock up) Merging usb.current/usb-linus (f8788d86ab28 Linux 5.6-rc3) Merging usb-gadget-fixes/fixes (42cd5ffe46c1 usb: dwc3: debug: fix string position formatting mixup with ret and len) Merging usb-serial-fixes/usb-linus (f8788d86ab28 Linux 5.6-rc3) Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue) Merging phy/fixes (be4e3c737eeb phy: mapphone-mdm6600: Fix timeouts by adding wake-up handling) Merging staging.current/staging-linus (f8788d86ab28 Linux 5.6-rc3) Merging char-misc.current/char-misc-linus (f8788d86ab28 Linux 5.6-rc3) Merging soundwire-fixes/fixes (bb6d3fb354c5 Linux 5.6-rc1) Merging thunderbolt-fixes/fixes (98d54f81e36b Linux 5.6-rc4) 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 (f3a60268f5ce selftest/lkdtm: Use local .gitignore) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging slave-dma-fixes/fixes (25962e1a7f1d dmaengine: imx-sdma: Fix the event id check to include RX event for UART6) 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 (d171c45da874 media: hantro: Fix broken media controller links) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (8e029eb0bcd6 MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling) Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) Merging omap-fixes/fixes (697b4f1603e7 Merge branch 'omap-for-v5.6/fixes-rc3' into fixes) Merging kvm-fixes/master (86f7e90ce840 KVM: VMX: check descriptor table exits on instruction emulation) Merging kvms390-fixes/master (5ef8acbdd687 KVM: nVMX: Emulate MTF when performing instruction emulation) Merging hwmon-fixes/hwmon (deddc9e8c0e0 hwmon: (pmbus/xdpe12284) Add callback for vout limits conversion) Merging nvdimm-fixes/libnvdimm-fixes (96222d53842d dax: pass NOWAIT flag to iomap_apply) Merging btrfs-fixes/next-fixes (5db834fa2a2b Merge branch 'misc-5.6' into next-fixes) Merging vfs-fixes/fixes (bf4498ad3f9a tmpfs: deny and force are not huge mount options) 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 (f8788d86ab28 Linux 5.6-rc3) 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 (51a21e0e7baf dt-bindings: Fix dtc warnings in examples) Merging scsi-fixes/fixes (03264ddde245 scsi: compat_ioctl: cdrom: Replace .ioctl with .compat_ioctl in four appropriate places) Merging drm-fixes/drm-fixes (f091bf39700d Merge tag 'drm-intel-fixes-2020-02-27' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (f4aaa44e8b20 drm/i915/selftests: Fix return in assert_mmap_offset()) 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 (f8788d86ab28 Linux 5.6-rc3) 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 (1a6f47b970cb riscv: Change code model of module to medany to improve data accessing) Merging pidfd-fixes/fixes (186e28a18aeb selftests: pidfd: Add pidfd_fdinfo_test in .gitignore) 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 (852d7655ea43 drm/shmem: drop pgprot_decrypted()) Merging kspp-gustavo/for-next/kspp (d5180902be1c firmware: google: vpd: Replace zero-length array with flexible-array member) Merging kbuild/for-next (098d44ffed27 kbuild: remove cc-option switch from -Wframe-larger-than=) Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1) Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) Merging dma-mapping/for-next (89bb6e2ac940 ARM/dma-mapping: merge __dma_supported into arm_dma_supported) 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 (c0cf33e910fe Merge branches 'fixes' and 'misc' into for-next) Merging arm64/for-next/core (9687d8c82a8a Merge branches 'for-next/memory-hotremove', 'for-next/arm_sdei' and 'for-next/misc' into for-next/core) Merging arm-perf/for-next/perf (29cc4ceeac12 arm64: perf: Support new DT compatibles) Merging arm-soc/for-next (ffebbbdf18d3 ARM: Document merges) Merging amlogic/for-next (80e3ca9ddabf Merge branch 'v5.7/drivers' into tmp/aml-rebuild) Merging aspeed/for-next (de285b938cf3 ARM: dts: aspeed: ast2600: Fix SCU IRQ controller nodes) Merging at91/at91-next (e9c02c092dc5 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) Merging imx-mxs/for-next (48b4bfe7105f Merge branch 'imx/defconfig' into for-next) Merging keystone/next (a1766a49fc90 Merge tag 'drivers_soc_for_5.6' into next) Merging mediatek/for-next (00862b8de3aa 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 (553792054c44 Merge branch 'omap-for-v5.7/accelerators' into for-next) Merging qcom/for-next (21b265038f22 Merge branches 'arm64-for-5.7', 'arm64-defconfig-for-5.7', 'defconfig-for-5.7', 'drivers-for-5.7' and 'dts-for-5.7' into for-next) Merging raspberrypi/for-next (ec3d259408ce ARM: bcm2835_defconfig: add support for Raspberry Pi4) Merging realtek/for-next (45698e00d5a9 Merge branch 'v5.6/dt' into next) Merging renesas/next (ddd8444ef822 Merge branch 'renesas-arm-dt-for-v5.7' into renesas-next) Merging reset/reset/next (4e0b9bc98c4a dt-bindings: reset: meson: add gxl internal dac reset) Merging rockchip/for-next (e815aa4ec694 Merge branch 'v5.7-armsoc/soc' into for-next) Merging samsung-krzk/for-next (2c3956ea5f5a Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (6143a33281e2 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging sunxi/sunxi/for-next (8944fe117069 Merge branch 'sunxi/dt-for-5.7' into sunxi/for-next) Merging tegra/for-next (56568eebf45e Merge branch for-5.7/arm64/dt into for-next) Merging clk/clk-next (7c45519cbf92 Merge branch 'clk-phase-errors' 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 (f8f35a5806f3 csky: Fixup init_fpu compile warning with __init) 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 (ebff58339d77 m68k: Replace setup_irq() by request_irq()) Merging microblaze/next (519fa60b6007 microblaze: Use asm generic cmpxchg.h for !SMP case) Merging mips/mips-next (bea176fb39ec MIPS: reduce print level for cache information) Merging nds32/next (d785c5a324cd nds32: configs: Cleanup CONFIG_CROSS_COMPILE) Merging nios2/for-next (051d75d3bb31 MAINTAINERS: Update Ley Foon Tan's email address) Merging openrisc/for-next (d95b56c77efd openrisc: Cleanup copy_thread_tls docs and comments) 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 (6a7f10c79574 soc: fsl: dpio: fix dereference of pointer p before null check) Merging risc-v/for-next (4aa8ab7e6967 RISC-V: Stop using LOCAL for the uaccess fixups) 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 (701dc81e7412 s390/mm: remove fake numa support) 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 (5a0a38f59535 Merge branch 'for-next-next-v5.6-20200228' into for-next-20200228) Merging ceph/master (3b20bc2fe4c0 ceph: noacl mount option is effectively ignored) Merging cifs/for-next (b1c698b64f81 cifs: potential unintitliazed error code in cifs_getattr()) 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 (bc36dfffd5f3 ext2: Silence lockdep warning about reclaim under xattr_sem) Merging ext4/dev (9db176bceb5c ext4: fix mount failure with quota configured as module) Merging f2fs/dev (eb699deb0727 f2fs: fix inconsistent comments) 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 (98d54f81e36b Linux 5.6-rc4) 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 (c2e87fd93396 ovl: allow remote upper) 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 (0dda2ddb7ded zonefs: select FS_IOMAP) 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 (d34f14ae521f Merge branch 'for-5.7-preferred-console' into for-next) Merging pci/next (daf98fffe4dc Merge branch 'pci/misc') Merging pstore/for-next/pstore (6c871b7314dd pstore: pstore_ftrace_seq_next should increase position index) Merging hid/for-next (530c6c3b37e2 Merge branch 'for-5.6/upstream-fixes' into for-next) Merging i2c/i2c/for-next (b00b4779fbc5 Merge branch 'master' into i2c/for-next) Merging i3c/i3c/next (cd851485ef29 i3c: master: Replace zero-length array with flexible-array member) Merging dmi/master (6eaaa9e89719 firmware/dmi: Report DMI Bios & EC firmware release) Merging hwmon-staging/hwmon-next (75ce99ed1ec8 hwmon: (lm73) Add support for of_match_table) Merging jc_docs/docs-next (0150aedda00e Merge branch 'mauro' into docs-next) CONFLICT (content): Merge conflict in Documentation/filesystems/zonefs.rst Merging v4l-dvb/master (8bc8c9ba03c4 media: Documentation:media:v4l-drivers: Update vivid documentation.) Merging v4l-dvb-next/master (54ecb8f7028c Linux 5.4-rc1) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (765943a4c048 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 (2de7fb60a474 cpupower: avoid multiple definition with gcc -fno-common) Merging opp/opp/linux-next (03758d60265c opp: Replace list_kref with a local counter) Merging thermal/thermal/linux-next (21d0fab5d6a9 thermal: imx_thermal: Use __maybe_unused instead of CONFIG_PM_SLEEP) 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 (65a166201552 RDMA/bnxt_re: Using vmalloc requires including vmalloc.h) Merging net-next/master (15070919f801 mvneta: add XDP ethtool errors stats for TX to driver) Merging bpf-next/master (48938b1e5027 net: phy: mscc: add constants for used interrupt mask bits) Merging ipsec-next/master (dda520c4d462 ESP: Export esp_output_fill_trailer function) Merging mlx5-next/mlx5-next (339ffae598ed net/mlx5e: Replace zero-length array with flexible-array member) Merging netfilter-next/master (8a8bc4867583 netfilter: xt_IDLETIMER: clean up some indenting) CONFLICT (content): Merge conflict in net/netfilter/ipset/ip_set_hash_gen.h 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 (b63882549b2b Bluetooth: btqca: Fix the NVM baudrate tag offcet for wcn3991) Merging mac80211-next/master (a862889b18ba cfg80211: fix documentation format) Merging gfs2/for-next (cc44457f1629 gfs2: leaf_dealloc needs to allocate one more revoke) 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 (2dcbfe365b13 mtd: spi-nor: Refactor spi_nor_read_id()) Merging crypto/master (1b44f93eb3e5 crypto: hisilicon - remove redundant assignment of pointer ctx) Merging drm/drm-next (60347451ddb0 Merge tag 'drm-misc-next-2020-02-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_object.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_scheduler.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c Merging amdgpu/drm-next (8b4b27328db7 drm/amdgpu/display: Fix Pollock Variant Detection) Merging drm-intel/for-linux-next (69f5c87cf43c drm/i915/huc: update TGL HuC to v7.0.12) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.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 (f56f1579a094 drm/etnaviv: add hwdb entry for gc400 found in STM32) Merging regmap/for-next (d29456d34def Merge branch 'regmap-5.6' into regmap-linus) Merging sound/for-next (2948f4a4e583 Merge branch 'topic/usb-uac2-effect-unit' into for-next) Merging sound-asoc/for-next (a69535be5097 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 (e5badd52e499 Merge branch 'for-5.7/io_uring' into for-next) Merging device-mapper/for-next (e0ab59c37793 dm: bump version of core and various targets) Merging pcmcia/pcmcia-next (71705c611263 PCMCIA/i82092: remove #if 0 block) Merging mmc/next (b6559a9563d6 mmc: host: hsq: Add missing MODULE_LICENSE() and MODULE_DESCRIPTION()) Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) Merging mfd/for-mfd-next (1129d6145ed5 mfd: Add support for Azoteq IQS620A/621/622/624/625) Merging backlight/for-backlight-next (7af43a76695d backlight: qcom-wled: Fix unsigned comparison to zero) Merging battery/for-next (1c5dfc5e3f2d power: supply: sc27xx: Add POWER_SUPPLY_PROP_CHARGE_NOW attribute) Merging regulator/for-next (43452b2d1013 Merge branch 'regulator-5.7' into regulator-next) Merging security/next-testing (3e27a33932df security: remove duplicated include from security.h) Merging apparmor/apparmor-next (01df52d726b5 apparmor: remove duplicate check of xattrs on profile attachment.) Merging integrity/next-integrity (96c82175d138 Merge branch 'next-integrity.logging-cleanup' into next-integrity) Merging keys/keys-next (43672cf93c6d Merge branch 'notifications-pipe-core' into keys-next) CONFLICT (content): Merge conflict in fs/pipe.c Applying: io_uring: fix up for get_pipe_info() API change Merging selinux/next (e3e0b582c321 selinux: remove unused initial SIDs and improve handling) 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 (2ba1c47a6b8c tpm_tis_spi: use new 'delay' structure for SPI transfer delays) Merging watchdog/master (44144c809e39 watchdog: da9062: Add dependency on I2C) Merging iommu/next (0c1960d98f14 Merge branches 'iommu/fixes', 'arm/qcom', 'x86/amd', 'virtio' 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 (76897807dc79 dt-bindings: clock: Convert UniPhier clock to json-schema) Merging mailbox/mailbox-for-next (c6c6bc6ea9fc mailbox: imx: add support for imx v1 mu) Merging spi/for-next (d340926b711f Merge branch 'spi-5.7' into spi-next) Merging tip/auto-latest (1a5d4fe92df7 Merge branch 'core/objtool') Merging clockevents/timers/drivers/next (cc2550b421aa clocksource: Replace setup_irq() by request_irq()) Merging edac/edac-for-next (ffa9a9758be2 Merge branch 'edac-urgent' into edac-for-next) Merging irqchip/irq/irqchip-next (5186a6cc3ef5 irqchip/gic-v3-its: Rename VPENDBASER/VPROPBASER accessors) Merging ftrace/for-next (2910b5aa6f54 bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue) Merging rcu/rcu/next (36dcdec0f468 Documentation/locking/atomic: Add a litmus test smp_mb__after_atomic()) Merging kvm/linux-next (a93236fcbe1d KVM: s390: rstify new ioctls in api.rst) Merging kvm-arm/next (e43f1331e2ef arm64: Ask the compiler to __always_inline functions used by KVM at HYP) Merging kvm-ppc/kvm-ppc-next (fd24a8624eb2 KVM: PPC: Book3S PR: Fix -Werror=return-type build failure) Merging kvms390/next (cc674ef252f4 KVM: s390: introduce module parameter kvm.use_gisa) Merging xen-tip/linux-next (cf6e914a6b40 xen: Replace zero-length array with flexible-array member) 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 (8d92e160dd8f platform/x86: Kconfig: Fix a typo) 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 (dd47a83453e4 leds: pwm: convert to atomic PWM API) Merging ipmi/for-next (b5b746bc0a6f 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 (24e6aea4801b Merge 5.6-rc3 into usb-next) Merging usb-gadget/next (bb6d3fb354c5 Linux 5.6-rc1) Merging usb-serial/usb-next (0a68ec3d8a2c USB: serial: f81232: set F81534A serial port with RS232 mode) Merging usb-chipidea-next/ci-for-usb-next (cbdfbda4a166 usb: chipidea: otg: handling vbus disconnect event occurred during system suspend) Merging phy-next/next (909a5c78de91 phy: qcom: qmp: Add SDM845 QHP PCIe PHY) Merging tty/tty-next (ba08cf452f34 Merge 5.6-rc3 into tty-next) Merging char-misc/char-misc-next (1f836f5b10f2 Merge 5.6-rc3 into char-misc-next) Merging extcon/extcon-next (87ccafd3bd64 extcon: palmas: Hide error messages if gpio returns -EPROBE_DEFER) Merging soundwire/next (ed29a0a67267 Merge branch 'topic/asoc' into next) Merging thunderbolt/next (3084ea9ea889 thunderbolt: icm: Replace zero-length array with flexible-array member) Merging staging/staging-next (c85f15519d45 Merge 5.6-rc3 into staging-next) Merging mux/for-next (f356d58c3a04 Merge branch 'i2c-mux/for-next' into for-next) Merging icc/icc-next (e729c8ef5a3f interconnect: Handle memory allocation errors) Merging slave-dma/next (13a892d4aa24 dmaengine: ti: edma: fix null dereference because of a typo in pointer name) Merging cgroup/for-next (9bd5910d7f3d selftests/cgroup: add tests for cloning into cgroups) Merging scsi/for-next (4ba1955b41a3 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (c892193c1ec5 scsi: iscsi: Add support for asynchronous iSCSI session destruction) 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 (27a2a9a4fa1f Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (1931479788c5 gpiolib: fix bitmap operations related to line event watching) Merging gpio-intel/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging pinctrl/for-next (e683f2fbe1bc Merge branch 'devel' into for-next) 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 (a13ae6971599 proc: Dentry flushing without proc_mnt) Merging ktest/for-next (9b5f852ae20d ktest: Make default build option oldconfig not randconfig) Merging random/dev (e00d996a4317 random: fix data races at timer_rand_state) 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 (5d647ed7b352 Update MAINTAINERS to add reviewer for CoreSight) Merging rtc/rtc-next (4594d082dbe6 rtc: zynqmp: Clear alarm interrupt status before interrupt enable) Merging nvdimm/libnvdimm-for-next (7b27a8622f80 libnvdimm/e820: Retrieve and populate correct 'target_node' info) 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 (f8788d86ab28 Linux 5.6-rc3) 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 (8daa31303194 nvmem: release the write-protect pin) Merging xarray/xarray (d8e93e3f22d9 XArray: Optimise xas_sibling() if !CONFIG_XARRAY_MULTI) 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 (5ea771abd5a3 kdb: Censor attempts to set PROMPT without ENABLE_MEM_READ) Merging pidfd/for-next (8d19f1c8e193 prctl: PR_{G,S}ET_IO_FLUSHER to support controlling memory reclaim) Merging devfreq/devfreq-next (d4aaf8643cff PM / devfreq: Fix a typo in a comment) Merging hmm/hmm (fdf8822d38ed mm/mmu_notifier: prevent unpaired invalidate_start and invalidate_end) Merging fpga/for-next (2fb2e7cdfbb0 arm64: dts: agilex: correct service layer driver's compatible value) Merging kunit/test (bb6d3fb354c5 Linux 5.6-rc1) Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) Merging kunit-next/kunit (be886ba90cce kunit: run kunit_tool from any directory) Applying: thermal: imx_sc: remove COMPILE_TEST from IMX_SC_THERMAL Merging akpm-current/current (646a810fca01 ubsan: include bug type in report header) CONFLICT (content): Merge conflict in init/main.c CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/m68k/include/asm/Kbuild $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/dma/tegra20-apb-dma.c: fix platform_get_irq.cocci warnings 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: mm: annotate a data race in page_zonenum() Applying: mm/memory.c: refactor insert_page to prepare for batched-lock insert Applying: mm: bring sparc pte_index() semantics inline with other platforms Applying: mm: define pte_index as macro for x86 Applying: mm/memory.c: add vm_insert_pages() Applying: mm-add-vm_insert_pages-fix Applying: add missing page_count() check to vm_insert_pages(). Applying: mm: vm_insert_pages() checks if pte_index defined Applying: net-zerocopy: use vm_insert_pages() for tcp rcv zerocopy Applying: net-zerocopy-use-vm_insert_pages-for-tcp-rcv-zerocopy-fix Applying: arm/arm64: add support for folded p4d page tables Applying: arm64/mm: implement unmap_hotplug_p4d_range Applying: arm-arm64-add-support-for-folded-p4d-page-tables-fix-fix Applying: h8300: remove usage of __ARCH_USE_5LEVEL_HACK Applying: hexagon: remove __ARCH_USE_5LEVEL_HACK Applying: ia64: add support for folded p4d page tables Applying: nios2: add support for folded p4d page tables Applying: openrisc: add support for folded p4d page tables Applying: powerpc/32: drop get_pteptr() Applying: powerpc: add support for folded p4d page tables Applying: fix for "powerpc: add support for folded p4d page tables" Applying: sh: fault: modernize printing of kernel messages Applying: sh: drop __pXd_offset() macros that duplicate pXd_index() ones Applying: sh: add support for folded p4d page tables Applying: unicore32: remove __ARCH_USE_5LEVEL_HACK Applying: asm-generic: remove pgtable-nop4d-hack.h Applying: mm: remove __ARCH_HAS_5LEVEL_HACK and include/asm-generic/5level-fixup.h Applying: fs/seq_file.c: seq_read(): add info message about buggy .next functions Applying: kernel/gcov/fs.c: gcov_seq_next() should increase position index Applying: ipc/util.c: sysvipc_find_ipc() should increase position index 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 (96eb50b7bbd1 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Attachment:
pgpZFXB6m3CMy.pgp
Description: OpenPGP digital signature
