Hi all, Changes since 20201223: New tree: actions The rcu tree gained a build failure so I used the version from next-20201223. The staging tree gained build failures so I used the version from next-20201223. Non-merge commits (relative to Linus' tree): 950 961 files changed, 35277 insertions(+), 14403 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 330 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 (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging fixes/fixes (9223e74f9960 Merge tag 'io_uring-5.10-2020-11-27' of git://git.kernel.dk/linux-block) Merging kbuild-current/fixes (63e184ea9869 kconfig: remove 'kvmconfig' and 'xenconfig' shorthands) Merging arc-current/for-curr (3a71e423133a ARC: build: use $(READELF) instead of hard-coded readelf) Merging arm-current/fixes (e64ab473ddda ARM: 9034/1: __div64_32(): straighten up inline asm constraints) Merging arm64-fixes/for-next/fixes (9fd339a45be5 arm64: Work around broken GCC 4.9 handling of "S" constraint) Merging arm-soc-fixes/arm/fixes (7887cc89d585 ARM: dts: ux500/golden: Set display max brightness) Merging drivers-memory-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging m68k-current/for-linus (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) Merging powerpc-fixes/fixes (d5c243989fb0 powerpc/32: Fix vmap stack - Properly set r1 before activating MMU on syscall too) Merging s390-fixes/fixes (129975e75b9a s390/Kconfig: sort config S390 select list once again) 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 (4bfc4714849d Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging bpf/master (04901aab40ea bpf: Fix a task_iter bug caused by a merge conflict resolution) Merging ipsec/master (56ce7c25ae15 xfrm: Fix oops in xfrm_replay_advance_bmp) Merging netfilter/master (b4e70d8dd9ea netfilter: nftables: add set expression flags) Merging ipvs/master (5c8193f568ae netfilter: ipset: fix shift-out-of-bounds in htable_bits()) Merging wireless-drivers/master (bfe55584713b MAINTAINERS: switch to different email address) Merging mac80211/master (2c85ebc57b3e Linux 5.10) Merging rdma-fixes/for-rc (340b940ea0ed RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait) Merging sound-current/for-linus (b0e130630201 ALSA: usb-audio: Add quirk for RC-505) Merging sound-asoc-fixes/for-linus (1f092d1c8819 ASoC: AMD Renoir - add DMI entry for Lenovo ThinkPad X395) Merging regmap-fixes/for-linus (cffa4b2122f5 regmap: debugfs: Fix a memory leak when calling regmap_attach_dev) Merging regulator-fixes/for-linus (2ae6f64ce1ce Merge tag 'v5.11-rc1' into regulator-5.11) Merging spi-fixes/for-linus (6820e812dafb spi: Fix the clamping of spi->max_speed_hz) Merging pci-current/for-linus (5c8fe583cce5 Linux 5.11-rc1) Merging driver-core.current/driver-core-linus (5c8fe583cce5 Linux 5.11-rc1) Merging tty.current/tty-linus (54ca955b5a40 serial: mvebu-uart: fix tx lost characters at power off) Merging usb.current/usb-linus (c318840fb2a4 USB: Gadget: dummy-hcd: Fix shift-out-of-bounds bug) Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup) Merging usb-serial-fixes/usb-linus (0477e9288185 Linux 5.10-rc7) Merging usb-chipidea-fixes/for-usb-fixes (65403ff98ebb MAINTAINERS: Update address for Cadence USB3 driver) Merging phy/fixes (ef019c5daf03 PHY: Ingenic: fix unconditional build of phy-ingenic-usb) Merging staging.current/staging-linus (d887d6104ade staging: mt7621-dma: Fix a resource leak in an error handling path) Merging char-misc.current/char-misc-linus (f93274ef0fe9 crypto: asym_tpm: correct zero out potential secrets) Merging soundwire-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging thunderbolt-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging input-current/for-linus (f605be6a57b4 Input: st1232 - wait until device is ready before reading resolution) Merging crypto-current/master (0aa171e9b267 crypto: ecdh - avoid buffer overflow in ecdh_set_secret()) 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 (5f24433c4a68 selftests: Skip BPF seftests by default) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch) Merging dmaengine-fixes/fixes (bb76c466788d dt-bindings: dma: ti: Update maintainer and author information) Merging backlight-fixes/for-backlight-fixes (bbf5c979011a Linux 5.9) Merging mtd-fixes/mtd/fixes (33d974e76e21 mtd: rawnand: xway: Do not force a particular software ECC engine) Merging mfd-fixes/for-mfd-fixes (bbf5c979011a Linux 5.9) Merging v4l-dvb-fixes/fixes (3d1387b3b8f6 media: vidtv: fix some warnings) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (698222457465 MIPS: Fix malformed NT_FILE and NT_SIGINFO in 32bit coredumps) Merging at91-fixes/at91-fixes (5c8fe583cce5 Linux 5.11-rc1) Merging omap-fixes/fixes (181739822cf6 ARM: dts; gta04: SPI panel chip select is active low) Merging kvm-fixes/master (111d0bda8eeb tools/kvm_stat: Exempt time-based counters) Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390) Merging hwmon-fixes/hwmon (1eda52334e6d hwmon: (pwm-fan) Ensure that calculation doesn't discard big period values) Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX) Merging btrfs-fixes/next-fixes (720f4b1e93d9 Merge branch 'misc-5.11' into next-fixes) Merging vfs-fixes/fixes (6220e48d9640 [regression fix] really dumb fuckup in sparc64 __csum_partial_copy() changes) Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()) Merging i3c-fixes/i3c/fixes (291b5c9870fc i3c/master/mipi-i3c-hci: Fix position of __maybe_unused in i3c_hci_of_match) Merging drivers-x86-fixes/fixes (c9aa128080cb platform/x86: touchscreen_dmi: Add info for the Irbis TW118 tablet) Merging samsung-krzk-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging pinctrl-samsung-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging devicetree-fixes/dt/linus (2b8f061a4f50 dt-bindings: Drop redundant maxItems/items) Merging scsi-fixes/fixes (4da3a54f5a02 Revert "scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()") Merging drm-fixes/drm-fixes (2c85ebc57b3e Linux 5.10) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (7c5c15dffe1e drm/i915/gt: Declare gen9 has 64 mocs entries!) Merging mmc-fixes/fixes (c0d638a03bc5 mmc: mediatek: mark PM functions as __maybe_unused) Merging rtc-fixes/rtc-fixes (5c8fe583cce5 Linux 5.11-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 (20620d72c31e riscv: return -ENOSYS for syscall -1) Merging pidfd-fixes/fixes (a409ed156a90 Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake) Merging spdx/spdx-linus (5c8fe583cce5 Linux 5.11-rc1) Merging gpio-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) Merging pinctrl-intel-fixes/fixes (5c8fe583cce5 Linux 5.11-rc1) 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 (fd4e788e971c drm/omap: sdi: fix bridge enable/disable) Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang) Merging kbuild/for-next (a76082b037f5 Makefile: use smaller dictionary size for xz module compression) Merging compiler-attributes/compiler-attributes (196793946264 Compiler Attributes: remove CONFIG_ENABLE_MUST_CHECK) Merging dma-mapping/for-next (f726c72d6c05 dma-mapping: benchmark: check the validity of dma mask bits) Merging asm-generic/master (2c85ebc57b3e Linux 5.10) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (ecbbb88727ae Merge branch 'devel-stable' into for-next) Merging arm64/for-next/core (95d1718c961e Merge remote-tracking branch 'arm64/for-next/iommu/core' into for-next/core) Merging arm-perf/for-next/perf (881b0520504a perf/imx_ddr: Add system PMU identifier for userspace) Merging arm-soc/for-next (9b28a2eacfe4 soc: document merges) Merging actions/for-next (a501abf8d8cb Merge branch 'v5.12/soc' into for-next) Merging amlogic/for-next (517c49f849d7 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 (3e3d5e8a7d73 Merge branches 'at91-soc' and 'at91-defconfig' into at91-next) Merging drivers-memory/for-next (bd96a89ca3fe memory: emif: Use DEFINE_SPINLOCK() for spinlock) Merging imx-mxs/for-next (09690c0e0d1c Merge branch 'imx/defconfig' into for-next) Merging keystone/next (b2a8f6ce4bdc Merge branch 'for_5.11/drivers-soc' into next) Merging mediatek/for-next (727bfb2c55b0 Merge branch 'v5.10-next/soc' into for-next) Merging mvebu/for-next (dc14300bb67b Merge branch 'mvebu/dt64' into mvebu/for-next) Merging omap/for-next (792952314166 Merge branch 'omap-for-v5.11/dt' into for-next) Merging qcom/for-next (ce4503eee3c3 Merge branches 'arm64-defconfig-for-5.12', 'arm64-for-5.12' and 'drivers-for-5.12' into for-next) Merging raspberrypi/for-next (e10bb7f95cba ARM: dts: bcm2711: Use compatible string for BCM2711 DSI1) Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (b8e76cdb1574 Merge branches 'renesas-arm-dt-for-v5.12' and 'renesas-dt-bindings-for-v5.12' into renesas-next) Merging reset/reset/next (69e392526dc2 dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema) Merging rockchip/for-next (e15c5c9836dc Merge branch 'v5.11-armsoc/dts64' into for-next) Merging samsung-krzk/for-next (ef2a4443c150 Merge branch 'next/dt' into for-next) Merging scmi/for-linux-next (0477e9288185 Linux 5.10-rc7) Merging stm32/stm32-next (814fddb955f8 ARM: multi_v7_defconfig: enable STM32 dfsdm audio support) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/connector/usb-connector.yaml Merging sunxi/sunxi/for-next (23e85be1ec81 ARM: dts: sun8i-h2-plus-bananapi-m2-zero: add regulator nodes vcc-dram and vcc1v2) Merging tegra/for-next (b11a0dfbd316 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 (5c8fe583cce5 Linux 5.11-rc1) Merging clk/clk-next (abe7e32f1d50 Merge branches 'clk-ingenic', 'clk-vc5', 'clk-cleanup', 'clk-canaan' and 'clk-marvell' into clk-next) Merging clk-renesas/renesas-clk (ab2ccacd7386 clk: renesas: r8a779a0: Add RWDT clocks) Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops) Merging csky/linux-next (1417ebdded8b csky: Sync riscv mm/fault.c for easy maintenance) 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 (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) Merging m68knommu/for-next (8b22820efb35 m68k: m68328: remove duplicate code) Merging microblaze/next (05cdf457477d microblaze: Remove noMMU code) Merging mips/mips-next (dbafd5105cfd MIPS: No need to check CPU 0 in cps_cpu_disable()) 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 (2c85ebc57b3e Linux 5.10) Merging powerpc/next (8a5be36b9303 Merge tag 'powerpc-5.11-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 (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A) Merging risc-v/for-next (e2ae634014d3 Merge tag 'riscv-for-linus-5.11-mw0' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) Merging s390/for-next (5e935f340864 Merge branch 'fixes' into for-next) 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 (1fb1abc83636 um: Fix build w/o CONFIG_PM_SLEEP) Merging xtensa/xtensa-for-next (7b79eba1d0d1 xtensa: fix spelling mistake in Kconfig "wont" -> "won't") Merging fscrypt/master (a14d0b676491 fscrypt: allow deleting files with unsupported encryption policy) Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly) Merging btrfs/for-next (97847e06525b Merge branch 'for-next-next-v5.10-20201211' into for-next-20201211) CONFLICT (content): Merge conflict in fs/btrfs/space-info.c Merging ceph/master (664f1e259a98 libceph: add __maybe_unused to DEFINE_MSGR2_FEATURE) Merging cifs/for-next (03965997e84a smb3: allow files to be created with backslash in file name) 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 (d8b3df8b1048 erofs: avoid using generic_block_bmap) Merging exfat/dev (614cb5894306 Merge tag 'acpi-5.11-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) Merging ext3/for_next (bdcfc08b8b5b Pull warning fix from Christoph) Merging ext4/dev (5a3b590d4b2d ext4: don't leak old mountpoint samples) CONFLICT (content): Merge conflict in fs/ext4/super.c Merging f2fs/dev (e3279133dd63 f2fs: relocate f2fs_precache_extents()) Merging fsverity/fsverity (bde493349025 fs-verity: move structs needed for file signing to UAPI header) Merging fuse/for-next (5d069dbe8aaf fuse: fix bad inode) Merging jfs/jfs-next (3bef198f1b17 JFS: more checks for invalid superblock) Merging nfs/linux-next (5c8fe583cce5 Linux 5.11-rc1) Merging nfs-anna/linux-next (11392155f2bd NFS: Disable READ_PLUS by default) CONFLICT (content): Merge conflict in fs/nfs/nfs4proc.c Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class) Merging cel/cel-next (7b723008f9c9 NFSD: Restore NFSv4 decoding's SAVEMEM functionality) Merging orangefs/for-next (c1048828c3db orangefs: add splice file operations) Merging overlayfs/overlayfs-next (459c7c565ac3 ovl: unprivieged mounts) Merging ubifs/next (b80a974b8c58 ubifs: ubifs_dump_node: Dump all branches of the index node) Merging v9fs/9p-next (324a158fe535 fs: 9p: add generic splice_write file operation) Merging xfs/for-next (e82226138b20 xfs: remove xfs_buf_t typedef) Merging zonefs/for-next (6bea0225a4bf zonefs: fix page reference and BIO leak) 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 (86cb91fe11d2 Merge branch 'work.misc' into for-next) Merging printk/for-next (2e9dda43cb06 Merge branch 'printk-rework' into for-next) Merging pci/next (255b2d524884 Merge branch 'remotes/lorenzo/pci/misc') Merging pstore/for-next/pstore (26fecbf7602d pstore: Move kmsg_bytes default into Kconfig) Merging hid/for-next (cdaa1e42b483 Merge branch 'for-5.10/upstream-fixes' into for-next) Merging i2c/i2c/for-next (d6da298d1b8b Merge branch 'i2c/for-current' into i2c/for-next) Merging i3c/i3c/next (5c8fe583cce5 Linux 5.11-rc1) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved) Merging hwmon-staging/hwmon-next (bae99e301bea hwmon: (pwm-fan) Support multiple fan tachometers) Merging jc_docs/docs-next (798ed7800e20 atomic: remove further references to atomic_ops) Merging v4l-dvb/master (5c8fe583cce5 Linux 5.11-rc1) Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include) CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_dp_helper.c CONFLICT (content): Merge conflict in Documentation/dev-tools/kasan.rst Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe()) Merging pm/linux-next (a04307bd9ddd Merge branches 'pm-cpufreq', 'pm-cpuidle' and 'powercap' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (c8bb45205438 Merge branch 'cpufreq/scmi' into cpufreq/arm/linux-next) Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information) Merging devfreq/devfreq-next (6a575e84f11e PM / devfreq: tegra30: Separate configurations per-SoC generation) Merging opp/opp/linux-next (0e1d9ca1766f opp: Call the missing clk_put() on error) Merging thermal/thermal/linux-next (67698880ac9d thermal: int340x: Support Alder Lake) 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 (e998879d4fb7 x86,swiotlb: Adjust SWIOTLB bounce buffer size for SEV guests) Merging rdma/for-next (e246b7c035d7 RDMA/cma: Don't overwrite sgid_attr after device is released) Merging net-next/master (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) Merging bpf-next/for-next (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) Merging ipsec-next/master (c7a5899eb26e xfrm: redact SA secret with lockdown confidentiality) Merging mlx5-next/mlx5-next (5c8fe583cce5 Linux 5.11-rc1) Merging netfilter-next/master (3db1a3fa9880 Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) Merging ipvs-next/master (efd5a1584537 net: hns3: fix expression that is currently always true) Merging wireless-drivers-next/master (13458ffe0a95 net: x25: Remove unimplemented X.25-over-LLC code stubs) Merging bluetooth/master (a5687c644015 Bluetooth: Fix initializing response id after clearing struct) Merging mac80211-next/master (13458ffe0a95 net: x25: Remove unimplemented X.25-over-LLC code stubs) Merging gfs2/for-next (5a67b79045e6 gfs2: make recovery workqueue operate on a gfs2 mount point, not journal) Merging mtd/mtd/next (4c9e94dff65c Merge tags 'spi-nor/for-5.11' and 'nand/for-5.11' into mtd/next) Merging nand/nand/next (ee4e0eafa43c mtd: spinand: macronix: Add support for MX35LFxG24AD) Merging spi-nor/spi-nor/next (31ad3eff093c mtd: spi-nor: keep lock bits if they are non-volatile) Merging crypto/master (fecff3b931a5 crypto: picoxcell - Remove PicoXcell driver) Merging drm/drm-next (5b2fc08c455b Merge tag 'amd-drm-fixes-5.11-2020-12-23' of git://people.freedesktop.org/~agd5f/linux into drm-next) Merging amdgpu/drm-next (6db5a939c8db drm/amdgpu: take runtime pm reference when we attach a buffer) Merging drm-intel/for-linux-next (046f70d31ddb drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping) Merging drm-tegra/drm/tegra/for-next (bf3a3cdcad40 drm/tegra: sor: Disable clocks on error in tegra_sor_init()) Merging drm-misc/for-linux-next (be3e477effba drm/komeda: Fix bit check to import to value of proper type) Merging drm-msm/msm-next (57f04815fd95 drm/msm: Fix WARN_ON() splat in _free_object()) Merging imx-drm/imx-drm/next (b658e2a1443c gpu: drm: imx: convert comma to semicolon) Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock) Merging regmap/for-next (cffa4b2122f5 regmap: debugfs: Fix a memory leak when calling regmap_attach_dev) Merging sound/for-next (64062869f0d6 ALSA: maestro: Use DIV_ROUND_CLOSEST() instead of open-coding it) Merging sound-asoc/for-next (8745a58d836b Merge remote-tracking branch 'asoc/for-5.12' into asoc-next) Merging modules/modules-next (38dc717e9715 module: delay kobject uevent until after module init call) Merging input/next (f5cace4b93d7 Input: imx_keypad - add dependency on HAS_IOMEM) Merging block/for-next (dea8dcf2a9fa Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) Merging device-mapper/for-next (48b0777cd93d Revert "dm crypt: export sysfs of kcryptd workqueue") Merging pcmcia/pcmcia-next (70d3a462fc24 pcmcia: omap: Fix error return code in omap_cf_probe()) Merging mmc/next (72b248cfbf3f dt-bindings: mmc: eliminate yamllint warnings) Merging mfd/for-mfd-next (2fc3f48ad711 mfd: mcp-sa11x0: Use DIV_ROUND_UP to calculate rw_timeout) Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix interpolation) Merging battery/for-next (bb118e5178b3 power: supply: max8997_charger: Set CHARGER current limit) Merging regulator/for-next (a6beea781def Merge remote-tracking branch 'regulator/for-5.12' into regulator-next) Merging security/next-testing (9dcd47fc1f7d Merge branch 'fixes-v5.10' into next-testing) Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable) Merging integrity/next-integrity (207cdd565dfc ima: Don't modify file descriptor mode on the fly) Merging keys/keys-next (6b8945603d05 certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID) 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 (dea8dcf2a9fa Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) Merging tpmdd/next (5160ecd31a0f char: tpm: add i2c driver for cr50) Merging watchdog/master (5c8fe583cce5 Linux 5.11-rc1) Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data()) Merging audit/next (6b3211842a11 audit: replace atomic_add_return()) Merging devicetree/for-next (e33dc2f36367 dt-bindings: mali-bifrost: Add dynamic-power-coefficient) Merging mailbox/mailbox-for-next (5a6338cce9f4 mailbox: arm_mhuv2: Add driver) Merging spi/for-next (72de1f5c7116 Merge remote-tracking branch 'spi/for-5.12' into spi-next) Merging tip/auto-latest (1173fb292bae Merge branch 'x86/build') Merging clockevents/timers/drivers/next (8ae954caf49a clocksource/drivers/sh_cmt: Fix potential deadlock when calling runtime PM) Merging edac/edac-for-next (f2a34093730f Merge branch 'edac-misc' into edac-for-next) Merging irqchip/irq/irqchip-next (e1dc20995cb9 driver core: platform: Add extra error check in devm_platform_get_irqs_affinity()) Merging ftrace/for-next (f6a694665f13 tracing: Offload eval map updates to a work queue) Merging rcu/rcu/next (6b0ac27ffb70 ACPI: processor: Fix missing need_resched() check after rcu_idle_enter()) $ git reset --hard HEAD^ Merging next-20201223 version of rcu Merging kvm/next (d45f89f7437d KVM: SVM: fix 32-bit compilation) Merging kvm-arm/next (957cbca7317f KVM: arm64: Remove spurious semicolon in reg_to_encoding()) Merging kvm-ppc/kvm-ppc-next (dc924b062488 KVM: SVM: check CR4 changes against vcpu->arch) Merging kvms390/next (50a05be484cb KVM: s390: track synchronous pfault events in kvm_stat) Merging xen-tip/linux-next (6190c0ccaf5d xen: Kconfig: remove X86_64 depends from XEN_512GB) Merging percpu/for-next (7dd3050a0194 Merge branch 'for-5.12' into for-next) Merging workqueues/for-next (ac87f8ff6cf1 workqueue: Kick a worker based on the actual activation of delayed works) Merging drivers-x86/for-next (0cd3f561efa9 platform/x86: ISST: Mark mmio_range_devid_0 and mmio_range_devid_1 with static keyword) Merging chrome-platform/for-next (6ae9b5ffcaeb platform/chrome: cros_ec_typec: Tolerate unrecognized mux flags) Merging hsi/for-next (aa57e77b3d28 HSI: Fix PM usage counter unbalance in ssi_hw_init) Merging leds/for-next (9a5ad5c5b2d2 leds: trigger: fix potential deadlock with libata) Merging ipmi/for-next (dea8dcf2a9fa Merge tag 'for-5.11/dm-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) Merging driver-core/driver-core-next (5c8fe583cce5 Linux 5.11-rc1) Merging usb/usb-next (cb4d9b52ec06 usb: dwc3: drd: Improve dwc3_get_extcon() style) Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.) Merging usb-serial/usb-next (fddd408ad448 USB: serial: ftdi_sio: log the CBUS GPIO validity) Merging usb-chipidea-next/for-usb-next (fc71a6268982 usb: chipidea: tegra: Specify TX FIFO threshold in UDC SoC info) Merging phy-next/next (5c8fe583cce5 Linux 5.11-rc1) Merging tty/tty-next (01493ccb4436 tty: serial: icom: Use DEFINE_SPINLOCK() for spinlock) Merging char-misc/char-misc-next (5c8fe583cce5 Linux 5.11-rc1) Merging extcon/extcon-next (e1efdb604f5c extcon: max77693: Fix modalias string) Merging soundwire/next (5c8fe583cce5 Linux 5.11-rc1) Merging thunderbolt/next (82096ecf589d thunderbolt: Use kmemdup instead of kzalloc and memcpy) Merging vfio/next (bdfae1c9a913 vfio/type1: Add vfio_group_iommu_domain()) Merging staging/staging-next (1e9a9c7cba3c staging: rtl8192e: fix bool comparison in expressions) $ git reset --hard HEAD^ Merging next-20201223 version of staging Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging icc/icc-next (67288f74d483 interconnect: imx8mq: Use icc_sync_state) Merging dmaengine/next (5c8fe583cce5 Linux 5.11-rc1) Merging cgroup/for-next (2d18e54dd866 cgroup: Fix memory leak when parsing multiple source parameters) Merging scsi/for-next (2da499c6f7b1 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (cb5253198f10 scsi: cxgb4i: Fix TLS dependency) Merging vhost/linux-next (e13a6915a03f vhost/vsock: add IOTLB API support) Merging rpmsg/for-next (5c8fe583cce5 Linux 5.11-rc1) Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file) Merging gpio-brgl/gpio/for-next (a8fd37d9e829 docs: gpio: intro: Improve HTML formatting) Merging gpio-intel/for-next (5c8fe583cce5 Linux 5.11-rc1) Merging pinctrl/for-next (3df09cb8c92e pinctrl/spear: simplify the return expression of spear300_pinctrl_probe()) Merging pinctrl-intel/for-next (5c8fe583cce5 Linux 5.11-rc1) Merging pinctrl-renesas/renesas-pinctrl (7ba4a9591a8a pinctrl: renesas: Fix fall-through warnings for Clang) Merging pinctrl-samsung/for-next (5c8fe583cce5 Linux 5.11-rc1) Merging pwm/for-next (6eefb79d6f5b pwm: sun4i: Remove erroneous else branch) Merging userns/for-next (95ebabde382c capabilities: Don't allow writing ambiguous v3 file capabilities) Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email) Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds) Merging kselftest/next (63df571c37d9 selftests/vDSO: fix -Wformat warning in vdso_test_correctness) 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 (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection()) Merging rtc/rtc-next (5c8fe583cce5 Linux 5.11-rc1) Merging nvdimm/libnvdimm-for-next (127c3d2e7e8a Merge branch 'for-5.11/dax' into for-5.11/libnvdimm) Merging at24/at24/for-next (5c8fe583cce5 Linux 5.11-rc1) Merging ntb/ntb-next (5c8fe583cce5 Linux 5.11-rc1) Merging seccomp/for-next/seccomp (2c07343abd89 selftests/seccomp: Update kernel config) Merging kspp/for-next/kspp (09162bc32c88 Linux 5.10-rc4) Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) Merging slimbus/for-next (6790dc4a58f3 slimbus: qcom-ngd-ctrl: fix SSR dependencies) 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 (d1df458cbfdb hv_balloon: do adjust_managed_page_count() when ballooning/un-ballooning) 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 (7abe0224623f Merge tag 'time-namespace-v5.11' of gitolite.kernel.org:pub/scm/linux/kernel/git/brauner/linux 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 (5f6b99d0287d fs: ext4: Modify inode-test.c to use KUnit parameterized testing feature) 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 (4ea6fa2cb921 mhi: pci_generic: Fix implicit conversion warning) 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/arm64/include/asm/unistd.h CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl 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 (a305b995606f aio: simplify read_events()) $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (ccbb8dc47f0d secretmem-test-add-basic-selftest-for-memfd_secret2-fix)
Attachment:
pgpqbwEpYz7LC.pgp
Description: OpenPGP digital signature
