Hi all, Changes since 20201124: The arm-soc tree lost its build failure. The rdma tree gained a conflict against the arm-soc tree. The seccomp tree gained a conflict against the csky tree. The akpm-current tree gained a conflict against the kspp tree. Non-merge commits (relative to Linus' tree): 7706 7517 files changed, 614842 insertions(+), 127054 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 327 trees (counting Linus' and 85 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 (80145ac2f739 Merge tag 's390-5.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging fixes/fixes (418baf2c28f3 Linux 5.10-rc5) Merging kbuild-current/fixes (d1889589a4f5 builddeb: Fix rootless build in setuid/setgid directory) Merging arc-current/for-curr (f737561c7096 ARC: stack unwinding: reorganize how initial register state setup) Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template) Merging arm64-fixes/for-next/fixes (ff1712f953e2 arm64: pgtable: Ensure dirty bit is preserved across pte_wrprotect()) Merging arm-soc-fixes/arm/fixes (4765df4d3a13 Merge tag 'v5.10-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes) Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) Merging powerpc-fixes/fixes (b6b79dd53082 powerpc/64s: Fix allnoconfig build since uaccess flush) Merging s390-fixes/fixes (1179f170b6f0 s390: fix fpu restore in entry.S) Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (5204bb683c16 devlink: Fix reload stats structure) Merging bpf/master (36ccdf85829a net, xsk: Avoid taking multiple skbuff references) Merging ipsec/master (48f486e13ffd net: xfrm: fix memory leak in xfrm_user_policy()) Merging netfilter/master (986fbd9842ba netfilter: nf_tables: avoid false-postive lockdep splat) Merging ipvs/master (986fbd9842ba netfilter: nf_tables: avoid false-postive lockdep splat) Merging wireless-drivers/master (fe56d05ee6c8 iwlwifi: mvm: fix kernel panic in case of assert during CSA) Merging mac80211/master (849920c70339 devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill()) Merging rdma-fixes/for-rc (6830ff853a57 IB/mthca: fix return value of error branch in mthca_init_cq()) Merging sound-current/for-linus (eeacd80fcb29 ALSA: hda/realtek: Enable headset of ASUS UX482EG & B9400CEA with ALC294) Merging sound-asoc-fixes/for-linus (72b8a440418a Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) Merging regmap-fixes/for-linus (e6e9354b5830 regmap: Remove duplicate `type` field from regmap `regcache_sync` trace event) Merging regulator-fixes/for-linus (34c5aa2666db regulator: Kconfig: Fix REGULATOR_QCOM_RPMH dependencies to avoid build error) Merging spi-fixes/for-linus (7d052ca72d86 Merge remote-tracking branch 'spi/for-5.10' into spi-linus) Merging pci-current/for-linus (cce14622a703 PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller) Merging driver-core.current/driver-core-linus (f8394f232b1e Linux 5.10-rc3) Merging tty.current/tty-linus (418baf2c28f3 Linux 5.10-rc5) Merging usb.current/usb-linus (f3bc432aa8a7 USB: core: Change %pK for __user pointers to %px) Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) Merging usb-serial-fixes/usb-linus (5e4d659b10fd USB: serial: option: add Fibocom NL668 variants) Merging usb-chipidea-fixes/for-usb-fixes (7b7f84797023 usb: cdns3: gadget: calculate TD_SIZE based on TD) Merging phy/fixes (fb89b2544b64 phy: mediatek: fix spelling mistake in Kconfig "veriosn" -> "version") Merging staging.current/staging-linus (418baf2c28f3 Linux 5.10-rc5) Merging char-misc.current/char-misc-linus (4daeb2ae5cd8 Merge tag 'misc-habanalabs-fixes-2020-11-23' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-linus) Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging thunderbolt-fixes/fixes (600c0849cf86 thunderbolt: Fix use-after-free in remove_unplugged_switch()) Merging input-current/for-linus (ae3d6083acf6 Input: elan_i2c - fix firmware update on newer ICs) Merging crypto-current/master (c3a98c3ad5c0 crypto: x86/poly1305 - add back a needed assignment) Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer) Merging vfio-fixes/for-linus (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV) Merging kselftest-fixes/fixes (7d764b685ee1 selftests: binderfs: use SKIP instead of XFAIL) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging dmaengine-fixes/fixes (418baf2c28f3 Linux 5.10-rc5) Merging backlight-fixes/for-backlight-fixes (bbf5c979011a Linux 5.9) Merging mtd-fixes/mtd/fixes (b36bf0a0fe5d mtd: rawnand: socrates: Move the ECC initialization to ->attach_chip()) Merging mfd-fixes/for-mfd-fixes (bbf5c979011a Linux 5.9) Merging v4l-dvb-fixes/fixes (9215f6bb4705 media: venus: pm_helpers: Fix kernel module reload) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (ac3b57adf87a MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu) Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) Merging omap-fixes/fixes (05d5de6ba7db ARM: dts: dra76x: m_can: fix order of clocks) Merging kvm-fixes/master (c2b1209d852f MAINTAINERS: Update email address for Sean Christopherson) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) Merging hwmon-fixes/hwmon (60268b0e8258 hwmon: (amd_energy) modify the visibility of the counters) Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX) Merging btrfs-fixes/next-fixes (462b8e885b92 Merge branch 'misc-5.10' into next-fixes) Merging vfs-fixes/fixes (4bbf439b09c5 fix return values of seq_read_iter()) Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7) Merging drivers-x86-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging samsung-krzk-fixes/fixes (cd12e4f14f7c CREDITS: remove trailing white spaces) Merging pinctrl-samsung-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging devicetree-fixes/dt/linus (bdac39a3bd28 dt-bindings: clock: imx5: fix example) Merging scsi-fixes/fixes (e92643db5148 scsi: ufs: Fix race between shutdown and runtime resume flow) Merging drm-fixes/drm-fixes (6600f9d52213 Merge tag 'drm-intel-fixes-2020-11-19' 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 (280ffdb6ddb5 drm/i915/gt: Free stale request on destroying the virtual engine) Merging mmc-fixes/fixes (a42a7ec9bb99 mmc: sdhci-of-arasan: Fix clock registration error for Keem Bay SOC) Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1) Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2) Merging hyperv-fixes/hyperv-fixes (5f1251a48c17 video: hyperv_fb: Fix the cache type when mapping the VRAM) Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu)) Merging risc-v-fixes/fixes (f52c08ea5fc8 RISC-V: fix barrier() use in <vdso/processor.h>) Merging pidfd-fixes/fixes (aabe19b82793 nsproxy: use put_nsproxy() in switch_task_namespaces()) Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) Merging spdx/spdx-linus (3cea11cd5e3b Linux 5.10-rc2) Merging gpio-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging pinctrl-intel-fixes/fixes (5f714771d01e pinctrl: baytrail: Avoid clearing debounce value when turning it off) Merging erofs-fixes/fixes (a30573b3cdc7 erofs: fix setting up pcluster for temporary pages) Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) Merging kunit-fixes/kunit-fixes (3084db0e0d50 kunit: fix display of failed expectations for strings) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes) Merging memblock-fixes/fixes (b9bc36704cca ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations) Merging drm-misc-fixes/for-linux-next-fixes (2820526dd5c2 drm/vc4: kms: Don't disable the muxing of an active CRTC) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) Merging kbuild/for-next (0ce21d58b7af kconfig: qconf: show Qt version in the About dialog) Merging compiler-attributes/compiler-attributes (bbf5c979011a Linux 5.9) Merging dma-mapping/for-next (6b652b698b71 selftests/dma: add test application for DMA_MAP_BENCHMARK) Merging asm-generic/master (8eb42bcea5ae Merge branch 'asm-generic-fixes' into asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (40bd54f12902 Merge branch 'devel-stable' into for-next) Merging arm64/for-next/core (dfee38d54f41 Merge branch 'for-next/signal-tag-bits' into for-next/core) Merging arm-perf/for-next/perf (887e2cff0f8d perf: arm-cmn: Fix conversion specifiers for node type) Merging arm-soc/for-next (1cf51b1dd1b3 soc: document merges) Merging amlogic/for-next (84a1411c7549 Merge branch 'v5.11/soc' into tmp/aml-rebuild) Merging aspeed/for-next (41707a524026 Merge branches 'soc-for-v5.11' and 'defconfig-for-v5.11' into for-next) Merging at91/at91-next (35ce28fff6c8 Merge branches 'at91-drivers', 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) Merging drivers-memory/for-next (b17e7a4e9ce3 Merge branch 'for-v5.11/tegra-mc' into for-next) Merging imx-mxs/for-next (24462a1e187c Merge branch 'imx/defconfig' into for-next) Merging keystone/next (b2a8f6ce4bdc Merge branch 'for_5.11/drivers-soc' into next) Merging mediatek/for-next (9c6658a0dd4f Merge branch 'v5.10-next/soc' into for-next) Merging mvebu/for-next (f89c9685f6a1 Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (5092d3983488 Merge branch 'omap-for-v5.11/defconfig-take2' into for-next) Merging qcom/for-next (31feae7ae5d5 Merge branches 'arm64-for-5.11', 'arm64-defconfig-for-5.11', 'drivers-for-5.11' and 'dts-for-5.11' into for-next) Merging raspberrypi/for-next (278407a53c3b ARM: dts: bcm283x: increase dwc2's RX FIFO size) Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (b79a2639266d Merge branches 'renesas-arm-drivers-for-v5.11' and 'renesas-arm-soc-for-v5.11' into renesas-next) Merging reset/reset/next (3bfe8933f9d1 reset: meson: make it possible to build as a module) Merging rockchip/for-next (db4d9df43533 Merge branch 'v5.11-armsoc/drivers' into for-next) Merging samsung-krzk/for-next (66d6c136ac59 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (d07628cb5092 Merge tag 'scmi-updates-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) Merging stm32/stm32-next (1926d571a413 ARM: dts: stm32: lxa-mc1: add OSD32MP15x to list of compatibles) Merging sunxi/sunxi/for-next (8ebd74f80194 Merge branches 'sunxi/dt-for-5.11', 'sunxi/fixes-for-5.10' and 'sunxi/config-for-5.11' into sunxi/for-next) Merging tegra/for-next (cb2bdf8a18e7 Merge branch for-5.11/arm64/defconfig into for-next) Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next) Merging ti-k3-new/ti-k3-next (5d8609e574be Merge branch 'ti-k3-dts-next' into ti-k3-next) Merging clk/clk-next (9dc1f9729380 Merge branch 'clk-qcom' into clk-next) Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) Merging csky/linux-next (ba3b26607f55 csky: Optimize atomic operations with correct barrier usage) Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>) Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs) Merging m68k/for-next (a7b5458ce73b m68k: Fix WARNING splat in pmac_zilog driver) Merging m68knommu/for-next (d0198645d610 m68k: m68328: remove duplicate code) Merging microblaze/next (ed2124c0b9a8 microblaze: add support for TIF_NOTIFY_SIGNAL) Merging mips/mips-next (91c7a7e0656d MIPS: Loongson64: Fix wrong scache size when execute lscpu) Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>) Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through) Merging openrisc/for-next (d8398bf840f8 openrisc: add local64.h to fix blk-iocost build) Merging parisc-hd/for-next (19621e5fd02b parisc: Switch to clockevent based timers) CONFLICT (content): Merge conflict in arch/parisc/kernel/time.c Applying: revert the rest of "parisc: use legacy_timer_tick" Merging powerpc/next (3cea11cd5e3b Linux 5.10-rc2) Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges) Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) Merging risc-v/for-next (31564b8b6dba riscv: Add HAVE_IRQ_TIME_ACCOUNTING) Merging s390/for-next (b79e43ff5aa0 Merge branch 'features' into for-next) CONFLICT (content): Merge conflict in arch/s390/include/asm/mmu_context.h Merging sh/for-next (b0cfc315ff38 sh: fix syscall tracing) Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) Merging uml/linux-next (9a5085b3fad5 um: Call pgtable_pmd_page_dtor() in __pmd_free_tlb()) Merging xtensa/xtensa-for-next (dc293f210690 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype) Merging fscrypt/master (234f1b7f8daf fscrypt: remove unnecessary calls to fscrypt_require_key()) Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) Merging btrfs/for-next (0081e34925be Merge branch 'for-next-next-v5.10-20201124' into for-next-20201124) Merging ceph/master (62575e270f66 ceph: check session state after bumping session->s_seq) Merging cifs/for-next (1254100030b3 smb3: Handle error case during offload read path) Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue) Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) Merging erofs/dev (1b2b66d55670 erofs: remove a void EROFS_VERSION macro set in Makefile) Merging exfat/dev (f9893351acae Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging ext3/for_next (d5dc76f9bb43 Merge ext2 cleanup from Ira Weiny.) Merging ext4/dev (f902b2165010 ext4: fix bogus warning in ext4_update_dx_flag()) Merging f2fs/dev (632cc618fa14 f2fs: Handle casefolding with Encryption) Merging fsverity/fsverity (bde493349025 fs-verity: move structs needed for file signing to UAPI header) Merging fuse/for-next (9d769e6aa252 fuse: support SB_NOSEC flag to improve write performance) Merging jfs/jfs-next (c61b3e483900 jfs: Fix array index bounds check in dbAdjTree) Merging nfs/linux-next (418baf2c28f3 Linux 5.10-rc5) Merging nfs-anna/linux-next (11decaf8127b NFS: Remove unnecessary inode lock in nfs_fsync_dir()) Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) Merging cel/cel-next (d4c5dc41360a NFSD: Remove macros that are no longer used) Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret) Merging overlayfs/overlayfs-next (c11faf32599f ovl: fix incorrect extent info in metacopy case) Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path) Merging v9fs/9p-next (5bfe97d7382b 9p: Fix writeback fid incorrectly being attached to dentry) Merging xfs/for-next (eb8409071a1d xfs: revert "xfs: fix rmap key and record comparison functions") Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option) Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync()) Merging djw-vfs/vfs-for-next (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h) Merging file-locks/locks-next (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}()) Merging vfs/for-next (61c207915a76 Merge branches 'work.sparc', 'work.epoll', 'work.sparc32' and 'regset.followup' into for-next) Merging printk/for-next (8eb431c1f8e2 Merge branch 'for-5.11-null-console' into for-next) Merging pci/next (46f821a9cff2 Merge branch 'remotes/lorenzo/pci/misc') Merging pstore/for-next/pstore (3cea11cd5e3b Linux 5.10-rc2) Merging hid/for-next (292cbdcc69fe Merge branch 'for-5.10/upstream-fixes' into for-next) Merging i2c/i2c/for-next (c97e7615c15b Merge branch 'i2c/for-current' into i2c/for-next) Merging i3c/i3c/next (9ad9a52cce28 i3c/master: introduce the mipi-i3c-hci driver) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (9e6f991ca262 dt-bindings: hwmon: pwm-fan: Support multiple fan tachometer inputs) Merging jc_docs/docs-next (ac7711427014 doc:it_IT: align Italian documentation) Merging v4l-dvb/master (9463e07df8e0 media: v4l2-compat-ioctl32.c: add missing #ifdef CONFIG_COMPAT_32BIT_TIMEs) CONFLICT (content): Merge conflict in drivers/media/platform/marvell-ccic/mmp-driver.c Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (a8cb5559d809 Merge branch 'pm-cpufreq-fixes' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (32c855670808 cpufreq: vexpress-spc: Add missing MODULE_ALIAS) Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information) Merging devfreq/devfreq-next (98fd9972ed60 PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver) Merging opp/opp/linux-next (ed40e33c0b91 opp: Reduce the size of critical section in _opp_kref_release()) Merging thermal/thermal/linux-next (cb68a8580e20 thermal: amlogic: Add hwmon support) 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 (4f19d071f9be fs: dlm: check on existing node address) Merging swiotlb/linux-next (fc0021aa340a swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single) Merging rdma/for-next (172292be01db dma-mapping: remove dma_virt_ops) CONFLICT (content): Merge conflict in include/linux/dma-mapping.h Merging net-next/master (470dfd808ac4 lan743x: replace polling loop by wait_event_timeout()) Merging bpf-next/for-next (607c543f939d bpf: Sanitize BTF data pointer after module is loaded) Merging ipsec-next/master (8be33ecfc1ff net: skb_vlan_untag(): don't reset transport offset if set by GRO layer) Merging mlx5-next/mlx5-next (3650b228f83a Linux 5.10-rc1) Merging netfilter-next/master (988187e88103 ipvs: replace atomic_add_return()) Merging ipvs-next/master (0064c5c1b3bf net: xfrm: use core API for updating/providing stats) Merging wireless-drivers-next/master (7ec8a926188e cw1200: fix missing destroy_workqueue() on error in cw1200_init_common) Merging bluetooth/master (a88ef8506948 Bluetooth: Fix for Bluetooth SIG test L2CAP/COS/CFD/BV-14-C) Merging mac80211-next/master (0064c5c1b3bf net: xfrm: use core API for updating/providing stats) Merging gfs2/for-next (30d18b85bf15 gfs2: check for empty rgrp tree in gfs2_ri_update) Merging mtd/mtd/next (22ca56a34b32 mtd: devices: powernv_flash: Add function names to headers and fix 'dev') Merging nand/nand/next (b86bcb8f9999 mtd: rawnand: gpmi: fix reference count leak in gpmi ops) Merging spi-nor/spi-nor/next (ad624dfd7bb6 mtd: spi-nor: micron-st: allow using MT35XU512ABA in Octal DTR mode) Merging crypto/master (732b764099f6 crypto: sun8i-ce - fix two error path's memory leak) Merging drm/drm-next (31b05212360c Merge branch 'linux-5.11' of git://github.com/skeggsb/linux into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_bo.c Merging amdgpu/drm-next (7ff818f97c30 drm/amdgpu: Enable GPU reset for vangogh) CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_drv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c Merging drm-intel/for-linux-next (69d5c4b50165 Merge tag 'gvt-next-2020-11-23' of https://github.com/intel/gvt-linux into drm-intel-next-queued) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/gvt.h Merging drm-tegra/drm/tegra/for-next (123f01a0c989 drm/tegra: output: Do not put OF node twice) Merging drm-misc/for-linux-next (a14c6b0eef77 panel-simple: add Innolux N125HCE-GN1) Merging drm-msm/msm-next (e8c765811b10 drm/msm/dp: do not notify audio subsystem if sink doesn't support audio) CONFLICT (content): Merge conflict in include/drm/drm_crtc.h CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.h CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c Applying: drm/msm/gem: fix up for "drm/msm: Introduce GEM object funcs" Merging imx-drm/imx-drm/next (099e5bde9bd2 drm/imx: depend on COMMON_CLK to fix compile tests) Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock) Merging regmap/for-next (ac185479f48a Merge remote-tracking branch 'regmap/for-5.11' into regmap-next) Merging sound/for-next (43906287380f Merge branch 'topic/usb-audio-refactoring' into for-next) Merging sound-asoc/for-next (7ab445544a2a Merge remote-tracking branch 'asoc/for-5.11' into asoc-next) Merging modules/modules-next (24b9f0d22081 module: fix comment style) Merging input/next (f7bda6662fd4 Input: libps2 - fix fall-through warnings for Clang) Merging block/for-next (f7af08774d69 Merge branch 'for-5.11/io_uring' into for-next) Merging device-mapper/for-next (3f5dba110d12 dm writecache: remove BUG() and fail gracefully instead) Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static) Merging mmc/next (8223e885e74b mmc: mxc: Convert the driver to DT-only) Merging mfd/for-mfd-next (14639a22de65 mfd: cpcap: Fix interrupt regression with regmap clear_ack) Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix interpolation) Merging battery/for-next (7007fab4ae82 power: reset: POWER_RESET_OCELOT_RESET should depend on Ocelot or Sparx5) Merging regulator/for-next (c2c960d49a36 Merge remote-tracking branch 'regulator/for-5.11' into regulator-next) Merging security/next-testing (3650b228f83a Linux 5.10-rc1) Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) Merging integrity/next-integrity (b000d5cb954f ima: defer arch_ima_get_secureboot() call to IMA init time) Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type) Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot) Merging selinux/next (3df98d79215a lsm,selinux: pass flowi_common instead of flowi to the LSM hooks) Merging smack/next (9b0072e2b2b5 security/smack: remove unused varible 'rc') Merging tomoyo/master (e991a40b3d00 tomoyo: Limit wildcard recursion depth.) Merging tpmdd/next (8ffd778aff45 tpm: efi: Don't create binary_bios_measurements file for an empty log) Merging watchdog/master (3650b228f83a Linux 5.10-rc1) Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data()) Merging audit/next (6d915476e67d audit: trigger accompanying records when no rules present) Merging devicetree/for-next (616fde2dd60f dt-bindings: misc: convert fsl,dpaa2-console from txt to YAML) Merging mailbox/mailbox-for-next (c7dacf5b0f32 mailbox: avoid timer start from callback) Merging spi/for-next (52a7b4901084 Merge remote-tracking branch 'spi/for-5.11' into spi-next) Merging tip/auto-latest (9ea041b5e564 Merge branch 'ras/core') CONFLICT (content): Merge conflict in tools/power/cpupower/utils/helpers/misc.c Merging clockevents/timers/drivers/next (8da10e545406 clocksource/drivers/cadence_ttc: Fix memory leak in ttc_setup_clockevent()) Merging edac/edac-for-next (e6b9534d9db6 Merge branch 'edac-igen6' into edac-for-next) Merging irqchip/irq/irqchip-next (74cde1a53368 irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend) Merging ftrace/for-next (b111545d26c0 tracing: Remove the useless value assignment in test_create_synth_event()) Merging rcu/rcu/next (bb8c662823b2 torture: Make kvm.sh return failure upon build failure) Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup) Merging kvm-arm/next (ed4ffaf49bf9 KVM: arm64: Handle SCXTNUM_ELx traps) Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings) Merging kvms390/next (d121365715a0 s390/gmap: make gmap memcg aware) Merging xen-tip/linux-next (65cae18882f9 x86/xen: don't unbind uninitialized lock_kicker_irq) Merging percpu/for-next (eb4c8d15efda Merge branch 'for-5.11' into for-next) Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON()) Merging drivers-x86/for-next (bb81dcd4eda2 platform/x86: touchscreen_dmi: Add info for the Irbis TW118 tablet) Merging chrome-platform/for-next (de0f49487db3 platform/chrome: cros_ec_typec: Register partner altmodes) Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1) Merging leds/for-next (6c3e42616bf2 leds: various: add missing put_device() call in netxbig_leds_get_of_pdata()) Merging ipmi/for-next (368ffd9adc7a ipmi: msghandler: Suppress suspicious RCU usage warning) Merging driver-core/driver-core-next (33c0c9bdf7a5 drivers: base: fix some kernel-doc markups) Merging usb/usb-next (93c747ed00c1 usb: Fix fall-through warnings for Clang) Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) Merging usb-serial/usb-next (053af9e6e817 USB: serial: mos7720: defer state restore to a workqueue) Merging usb-chipidea-next/for-usb-next (7103c599177a usb: cdns3: fix NULL pointer dereference on no platform data) Merging phy-next/next (768a711e2d4b phy: samsung: phy-exynos-pcie: fix typo 'tunning') CONFLICT (content): Merge conflict in drivers/phy/samsung/phy-exynos-pcie.c CONFLICT (content): Merge conflict in MAINTAINERS Merging tty/tty-next (3b3e23092449 Merge 5.10-rc5 into tty-next) Merging char-misc/char-misc-next (93c69b2d1737 Merge 5.10-rc4 into char-misc-next) Merging extcon/extcon-next (54589b557a8d extcon: fsa9480: Support TI TSU6111 variant) Merging soundwire/next (47b8520997a8 soundwire: bus: only clear valid DPN interrupts) Merging thunderbolt/next (4e58171aa93f MAINTAINERS: Add Isaac as maintainer of Thunderbolt DMA traffic test driver) Merging vfio/next (2e6cfd496f5b vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages) Merging staging/staging-next (749c1e1481e1 Merge tag 'iio-for-5.11a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr) Merging icc/icc-next (8fb0f9de8eaf Merge branch 'icc-5.11' into HEAD) Merging dmaengine/next (5d051f37f49d dmaengine: ti: drop of_match_ptr and mark of_device_id table as maybe unused) CONFLICT (content): Merge conflict in drivers/dma/idxd/submit.c CONFLICT (content): Merge conflict in drivers/dma/idxd/registers.h CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c Merging cgroup/for-next (65026da59cda cgroup: Zero sized write should be no-op) Merging scsi/for-next (f9123bc98a4f Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (3256b4682386 scsi: fnic: Validate io_req before others) Merging vhost/linux-next (efd838fec17b vhost scsi: Add support for LUN resets.) Merging rpmsg/for-next (708abb0951d6 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) Merging gpio/for-next (6c33287665e0 pinctrl: pinctrl-microchip-sgpio: Add pinctrl driver for Microsemi Serial GPIO) Merging gpio-brgl/gpio/for-next (f52d6d8b43e5 gpio: sifive: To get gpio irq offset from device tree data) Merging gpio-intel/for-next (e709a7b5a066 gpiolib: acpi: Make Intel GPIO tree official for GPIO ACPI work) Merging pinctrl/for-next (8e5008b1a9a0 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (0b74e40a4e41 pinctrl: baytrail: Avoid clearing debounce value when turning it off) Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: remove unneeded break) Merging pwm/for-next (228fe8e4deb2 pwm: keembay: Fix build failure with -Os) Merging userns/for-next (6ac05e832a9e signal: define the SA_EXPOSE_TAGBITS bit in sa_flags) Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't") Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) Merging kselftest/next (c2e46f6b3e35 selftests/cgroup: Fix build on older distros) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC") Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next) Merging coresight/next (c5348c8a239b coresight-stm: Fix W=1 warning in STM driver) Merging rtc/rtc-next (673536cc5f21 rtc: pcf8523: use BIT) Merging nvdimm/libnvdimm-for-next (a1b8638ba132 Linux 5.9-rc7) Merging at24/at24/for-next (3650b228f83a Linux 5.10-rc1) Merging ntb/ntb-next (3650b228f83a Linux 5.10-rc1) Merging seccomp/for-next/seccomp (7ef95e3dbcee Merge branch 'for-linus/seccomp' into for-next/seccomp) CONFLICT (content): Merge conflict in arch/csky/include/asm/Kbuild Merging kspp/for-next/kspp (f2f20a989227 orphans: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1) Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) Merging slimbus/for-next (9c239fa83e2b slimbus: qcom-ngd-ctrl: Constify static structs) Merging nvmem/for-next (292b72c982a6 nvmem: imx-ocotp: add support for the unaliged word count) Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders) Merging hyperv/hyperv-next (206ad34d52a2 hv_netvsc: Validate number of allocated sub-channels) Merging auxdisplay/auxdisplay (351dcacc6d77 auxdisplay: panel: Remove redundant charlcd_ops structures) Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings) Merging pidfd/for-next (e06ce5515b74 Merge branch 'pidfd_o_nonblock' into for-next) Merging hmm/hmm (3650b228f83a Linux 5.10-rc1) Merging fpga/for-next (aaf8fe39c952 Revert "fpga: dfl: fix the definitions of type & feature_id for dfl devices") Merging kunit/test (3650b228f83a Linux 5.10-rc1) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache) Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver) Merging kunit-next/kunit (3650b228f83a Linux 5.10-rc1) Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) Merging mhi/mhi-next (7b7e4cee0299 Merge branch 'mhi-ath11k-immutable' into mhi-next) Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl Applying: rest of merge fix up for syscall conflict Merging memblock/for-next (5bdba520c1b3 mm: memblock: drop __init from memblock functions to make it inline) Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) Merging counters/counters (3650b228f83a Linux 5.10-rc1) Merging akpm-current/current (ab573a2b40b2 lib/lzo/lzo1x_compress.c: make lzogeneric1x_1_compress() static) CONFLICT (content): Merge conflict in mm/highmem.c CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in include/linux/mm.h CONFLICT (content): Merge conflict in arch/arc/Kconfig CONFLICT (content): Merge conflict in arch/Kconfig $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (138fee1cdec0 mm/gup: assert that the mmap lock is held in __get_user_pages())
Attachment:
pgp5BFkw6S9F5.pgp
Description: OpenPGP digital signature
