From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,LOCALPART_IN_SUBJECT, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF494C4741F for ; Fri, 6 Nov 2020 06:18:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2EC4021D81 for ; Fri, 6 Nov 2020 06:18:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="nAI2AmVD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726198AbgKFGSj (ORCPT ); Fri, 6 Nov 2020 01:18:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbgKFGSj (ORCPT ); Fri, 6 Nov 2020 01:18:39 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7451C0613CF; Thu, 5 Nov 2020 22:18:38 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4CS9F71d5Qz9sSs; Fri, 6 Nov 2020 17:18:35 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1604643515; bh=+RuFPQgRLs2pWHkINAvjQBnYv+BBkHpiHTpMw954QCA=; h=Date:From:To:Cc:Subject:From; b=nAI2AmVD2me4aqnj7LGqCbYNAJTmcKInI8yqILF0ZbP6knyI/ovN0k2zp2Xtch7oa iuvbVi7xnqJzyFFk9MlZMQgB+AbKxms069NS+c/sGcsiYV94cpykh3UN742+k43sur Qvp2TcYDc353qsAwdAiIeD9+nEG4qhcDChg6zI90JFzBZnffk4c0PVAQk8L2Cu5xWr 9Un8Sq9LN73xbPMpM7ROP3E7mKXMAFyXO/1d7QMsU7sQmhCGRSeVGzDF7EsQFonu5x BWul///QeJlal9SmbIHi58PJLAOFc/UUsFoinNBnV0KYIWxAAVXdPRxO4VpUH7rVjT lgC1dUC/Gaqdw== Date: Fri, 6 Nov 2020 17:18:34 +1100 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Nov 6 Message-ID: <20201106171834.64e4d6d5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/izEUfANREpAxV./u+4YROWG"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/izEUfANREpAxV./u+4YROWG Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20201105: Removed tree: mali-dp not updated in over a year The v4l-dvb tree gained a conflict against the v4l-dvb-fixes tree. The mfd tree still had its build failure so I used the version from next-20201104. The tip tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 3459 3818 files changed, 394667 insertions(+), 45320 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 326 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. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (521b619acdc8 Merge tag 'linux-kselftest-kunit-fixes-= 5.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-ksel= ftest) Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1) Merging kbuild-current/fixes (d1889589a4f5 builddeb: Fix rootless build in = setuid/setgid directory) Merging arc-current/for-curr (3b57533b460c ARC: [plat-hsdk] Remap CCMs supe= r early in asm boot trampoline) Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify= _panic() when copying optprobe template) Merging arm64-fixes/for-next/fixes (108aa503657e arm64: kexec_file: try mor= e regions if loading segments fails) Merging arm-soc-fixes/arm/fixes (3d696f42c7f4 soc: ti: ti_sci_pm_domains: c= heck for proper args count in xlate) Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE dr= iver to platform driver) Merging powerpc-fixes/fixes (33fe43cfd9b1 powerpc/8xx: Manage _PAGE_ACCESSE= D through APG bits in L1 entry) Merging s390-fixes/fixes (0b2ca2c7d0c9 s390/pci: fix hot-plug of PCI functi= on missing bus) Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macr= o) Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty= inodes after removing key) Merging net/master (2bcbf42add91 ionic: check port ptr before use) Merging bpf/master (25cf73b9ff88 libbpf: Fix possible use after free in xsk= _socket__delete) Merging ipsec/master (a779d91314ca net: xfrm: fix a race condition during a= llocing spi) Merging netfilter/master (fea07a487c6d net: openvswitch: silence suspicious= RCU usage warning) Merging ipvs/master (859191b234f8 Merge git://git.kernel.org/pub/scm/linux/= kernel/git/pablo/nf) Merging wireless-drivers/master (04516706bb99 iwlwifi: pcie: limit memory r= ead spin time) Merging mac80211/master (2aaf09a0e784 r8169: work around short packet hw bu= g on RTL8125) Merging rdma-fixes/for-rc (21fcdeec09ff RDMA/srpt: Fix typo in srpt_unregis= ter_mad_agent docstring) Merging sound-current/for-linus (a6c96672a64f Merge tag 'asoc-fix-v5.10-rc2= ' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for= -linus) Merging sound-asoc-fixes/for-linus (39f192539fb3 Merge remote-tracking bran= ch 'asoc/for-5.10' into asoc-linus) Merging regmap-fixes/for-linus (780f88b04704 Merge remote-tracking branch '= regmap/for-5.10' into regmap-linus) Merging regulator-fixes/for-linus (cf1ad559a20d regulator: defer probe when= trying to get voltage from unresolved supply) Merging spi-fixes/for-linus (ae36bbe9efb0 Merge remote-tracking branch 'spi= /for-5.10' into spi-linus) Merging pci-current/for-linus (832ea234277a PCI: mvebu: Fix duplicate resou= rce requests) Merging driver-core.current/driver-core-linus (d181bfe36715 Documentation: = remove mic/index from misc-devices/index.rst) Merging tty.current/tty-linus (3cea11cd5e3b Linux 5.10-rc2) Merging usb.current/usb-linus (afaa2e745a24 USB: Add NO_LPM quirk for Kings= ton flash drive) Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory le= ak in gadget_setup) Merging usb-serial-fixes/usb-linus (db0362eeb229 USB: serial: option: add T= elit FN980 composition 0x1055) Merging usb-chipidea-fixes/for-usb-fixes (e11d2bf27158 usb: cdns3: gadget: = own the lock wrongly at the suspend routine) Merging phy/fixes (25d76fed7ffe phy: cpcap-usb: Use IRQF_ONESHOT) Merging staging.current/staging-linus (3cea11cd5e3b Linux 5.10-rc2) Merging char-misc.current/char-misc-linus (a8643626d84b Merge tag 'misc-hab= analabs-fixes-2020-11-04' of ssh://gitolite.kernel.org/pub/scm/linux/kernel= /git/ogabbay/linux into char-misc-next) Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging thunderbolt-fixes/fixes (f8fa2c2e63c7 thunderbolt: Only configure U= SB4 wake for lane 0 adapters) Merging input-current/for-linus (b1884583fcd1 Input: i8042 - allow insmod t= o succeed on devices without an i8042 controller) 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 cas= e of -ENODEV) Merging kselftest-fixes/fixes (7d764b685ee1 selftests: binderfs: use SKIP i= nstead of XFAIL) Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure= to pass all module source files to spatch) Merging dmaengine-fixes/fixes (768664114b1a dmaengine: ti: k3-udma: fix -We= num-conversion warning) Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4) Merging mtd-fixes/mtd/fixes (9efac6ce7f62 mtd: rawnand: stm32_fmc2: fix bro= ken ECC) Merging mfd-fixes/for-mfd-fixes (22380b65dc70 mfd: mfd-core: Ensure disable= d devices are ignored without error) Merging v4l-dvb-fixes/fixes (9ac924b98728 media: cedrus: h264: Fix check fo= r presence of scaling matrix) Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified= HAS_IOMEM dependency) Merging mips-fixes/mips-fixes (31b4d8e172f6 MIPS: export has_transparent_hu= gepage() for modules) Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1) Merging omap-fixes/fixes (8f04aea048d5 ARM: OMAP2+: Restore MPU power domai= n if cpu_cluster_pm_enter() fails) Merging kvm-fixes/master (9478dec3b5e7 KVM: vmx: remove unused variable) Merging kvms390-fixes/master (f20d4e924b44 docs: kvm: add documentation for= KVM_CAP_S390_DIAG318) Merging hwmon-fixes/hwmon (18e8db7f6526 hwmon: (pmbus) Add mutex locking fo= r sysfs reads) Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for= CONFIG_DAX && !CONFIG_FS_DAX) Merging btrfs-fixes/next-fixes (6ce53ec0aba7 Merge branch 'misc-5.10' into = next-fixes) Merging vfs-fixes/fixes (77f6ab8b7768 don't dump the threads that had been = already exiting when zapped.) Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitia= lized 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 whi= te spaces) CONFLICT (content): Merge conflict in MAINTAINERS Merging pinctrl-samsung-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging devicetree-fixes/dt/linus (f84e2c5c528d dt-bindings: Another round = of adding missing 'additionalProperties/unevalutatedProperties') Merging scsi-fixes/fixes (0f52fcb99ea2 scsi: ufs: Try to save power mode ch= ange and UIC cmd completion timeout) Merging drm-fixes/drm-fixes (3cea11cd5e3b Linux 5.10-rc2) Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_= cac() failed issue) Merging drm-intel-fixes/for-linux-next-fixes (537457a979a0 drm/i915: Hold o= nto an explicit ref to i915_vma_work.pinned) Merging mmc-fixes/fixes (011fde48394b mmc: sdhci-of-esdhc: make sure delay = chain locked for HS400) 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 (dbf563eee0b8 x86/hyperv: Clarify comment= on x2apic mode) Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq h= andlers after dpio create) Merging risc-v-fixes/fixes (1bd14a66ee52 RISC-V: Remove any memblock repres= enting unusable memory area) Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough= notation) Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset han= dshake) Merging spdx/spdx-linus (3cea11cd5e3b Linux 5.10-rc2) Merging gpio-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging pinctrl-intel-fixes/fixes (3650b228f83a Linux 5.10-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_d= esc()) Merging kunit-fixes/kunit-fixes (0d0d245104a4 kunit: tools: fix kunit_tool = tests for parsing test plans) Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not di= rty twice for auth nodes) Merging memblock-fixes/fixes (b9bc36704cca ARM, xtensa: highmem: avoid clob= bering non-page aligned memory reservations) Merging drm-misc-fixes/for-linux-next-fixes (9522750c66c6 Fonts: Replace di= scarded const qualifier) Merging kspp-gustavo/for-next/kspp (3650b228f83a Linux 5.10-rc1) Merging kbuild/for-next (729e39a558eb kconfig: qconf: convert to Qt5 new si= gnal/slot connection syntax) Merging compiler-attributes/compiler-attributes (bbf5c979011a Linux 5.9) Merging dma-mapping/for-next (48ab6d5d1f09 dma-mapping: fix 32-bit overflow= with CONFIG_ARM_LPAE=3Dn) Merging asm-generic/master (78d127fd6892 Merge branch 'asm-generic-timers' = into asm-generic) Merging arc/for-next (def9d2780727 Linux 5.5-rc7) Merging arm/for-next (20f96e606509 Merge branches 'fixes' and 'misc' into f= or-next) Merging arm64/for-next/core (66dd3474702a arm64: proton-pack: Update commen= t to reflect new function name) Merging arm-perf/for-next/perf (887e2cff0f8d perf: arm-cmn: Fix conversion = specifiers for node type) Merging arm-soc/for-next (36ab3c32cafc ARM: SoC: document merges) Merging amlogic/for-next (4393916840fc Merge branch 'v5.11/soc' into tmp/am= l-rebuild) Merging aspeed/for-next (93db293b2aba Merge branch 'soc-for-v5.11' into for= -next) Merging at91/at91-next (0698efbb33ef Merge branches 'at91-soc', 'at91-dt' a= nd 'at91-defconfig' into at91-next) Merging drivers-memory/for-next (bf458a2d1d4e Merge branch 'mem-ctrl-next' = into for-next) Merging imx-mxs/for-next (5f8fb90aea46 Merge branch 'imx/defconfig' into fo= r-next) Merging keystone/next (a5e886fb26f2 Merge branch 'for_5.11/drivers-soc' int= o 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/f= or-next) Merging omap/for-next (7a159a1ad494 Merge branch 'fixes' into for-next) Merging qcom/for-next (c732298127a9 Merge branches 'arm64-for-5.11', 'drive= rs-for-5.11' and 'dts-for-5.11' into for-next) Merging raspberrypi/for-next (4564363351e2 ARM: dts: bcm2711: Enable the di= splay pipeline) Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next) Merging renesas/next (b860052992d7 Merge branch 'renesas-dt-bindings-for-v5= .11' into renesas-next) Merging reset/reset/next (da8c0e4ee95a reset: meson: make it possible to bu= ild as a module) Merging rockchip/for-next (1fdc65a3eb82 Merge branch 'v5.11-armsoc/dts64' i= nto for-next) Merging samsung-krzk/for-next (68c65b3b5f50 Merge branch 'next/dt' into for= -next) Merging scmi/for-linux-next (3cea11cd5e3b Linux 5.10-rc2) Merging sunxi/sunxi/for-next (13e9be90a0c9 Merge branches 'sunxi/dt-for-5.1= 1', 'sunxi/fixes-for-5.10' and 'sunxi/config64-for-5.11' into sunxi/for-nex= t) Merging tegra/for-next (9ea55312ba10 Merge branch for-5.10/arm64/defconfig = into for-next) Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' int= o ti-k3-next) Merging ti-k3-new/ti-k3-next (9dcd17be61e4 arm64: dts: ti: k3-am65: ringacc= : drop ti, dma-ring-reset-quirk) Merging clk/clk-next (f1b6e57d4e4b Merge branch 'clk-qcom' into clk-next) Merging clk-samsung/for-next (ff8e0ff9b996 clk: samsung: Use cached clk_hws= instead of __clk_lookup() calls) Merging csky/linux-next (d09101cb3c22 csky: Fixup show_regs doesn't contain= regs->usp) Merging h8300/h8300-next (8808515be0ed h8300: Replace by ) Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide = driver in defconfigs) Merging m68k/for-next (1fe9bacab2ac m68k: Remove unused mach_max_dma_addres= s) Merging m68knommu/for-next (ce93d1c29c02 m68k: m68328: remove duplicate cod= e) Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file= warning) Merging mips/mips-next (ab7cffb8d236 MIPS: ingenic: remove unused platform_= data header file) Merging nds32/next (54bde873682b nds32: Fix bogus reference to ) Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fa= ll-through) Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address= space check to access_ok) Merging parisc-hd/for-next (3b7ab4a74a2d 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 bridg= es) Merging soc-fsl/next (d97b957e32b1 soc: fsl: qe: Remove unnessesary check i= n ucc_set_tdm_rxtx_clk) Merging risc-v/for-next (f69e1c7418b1 RISC-V: Fix the VDSO symbol generaton= for binutils-2.35+) CONFLICT (content): Merge conflict in arch/riscv/kernel/vdso/Makefile Merging s390/for-next (97822baa4e8b 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 (f06885b3f3e3 um: vector: Add dynamic tap interfaces= and scripting) Merging xtensa/xtensa-for-next (4ca4c562efb6 xtensa: uaccess: Add missing _= _user to strncpy_from_user() prototype) Merging fscrypt/master (5b2a828b98ec fscrypt: export fscrypt_d_revalidate()) Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algo= rithm to reprobe/retry more quickly) Merging btrfs/for-next (a12315094469 Merge branch 'for-next-next-v5.10-2020= 1105' into for-next-20201105) Merging ceph/master (62575e270f66 ceph: check session state after bumping s= ession->s_seq) Merging cifs/for-next (3cea11cd5e3b Linux 5.10-rc2) Merging configfs/for-next (76ecfcb0852e samples: configfs: prefer pr_err() = over bare printk(KERN_ERR) Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git:/= /git.samba.org/sfrench/cifs-2.6) Merging erofs/dev (915f4c9358db erofs: remove unnecessary enum entries) Merging exfat/dev (f9893351acae Merge tag 'kconfig-v5.10' of git://git.kern= el.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) Merging ext3/for_next (11c514a99bb9 quota: Sanity-check quota file headers = on load) Merging ext4/dev (00c69f98e83d ext4: use IS_ERR() for error checking of pat= h) Merging f2fs/dev (aabe197f7422 f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl) Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() f= or ->i_verity_info) Merging fuse/for-next (42d3e2d041f0 virtiofs: calculate number of scatter-g= ather elements accurately) Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flex= ible-array member) Merging nfs/linux-next (3cea11cd5e3b Linux 5.10-rc2) Merging nfs-anna/linux-next (7302e49ff190 NFS: Remove unnecessary inode loc= k in nfs_fsync_dir()) Merging nfsd/nfsd-next (856deb866d16 Linux 5.9-rc5) Merging cel/cel-next (f68914573f8f NFSD: A semicolon is not needed after a = switch statement.) Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assign= ment to variable ret) Merging overlayfs/overlayfs-next (be4df0cea08a ovl: use generic vfs_ioc_set= flags_prepare() helper) Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication= resource in error handling path) Merging v9fs/9p-next (7ca1db21ef8e net: 9p: initialize sun_server.sun_path = to have addr's value only when addr is valid) Merging xfs/for-next (46afb0628b86 xfs: only flush the unshared range in xf= s_reflink_unshare) Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mo= unt option) Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() befo= re generic_write_sync()) Merging djw-vfs/vfs-for-next (407e9c63ee57 vfs: move the generic write and = copy checks out of mm) Merging file-locks/locks-next (8d1ddb5e7937 fcntl: Fix potential deadlock i= n send_sig{io, urg}()) Merging vfs/for-next (8853bf827ca8 Merge branches 'work.sparc', 'work.epoll= ', 'work.sparc32' and 'regset.followup' into for-next) Applying: fix up for merge of arch/sparc/lib/memset.S Merging printk/for-next (de6e7a24979b Merge branch 'for-5.10-trivial' into = for-next) Merging pci/next (405196258f54 Merge branch 'pci/misc') Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao) CONFLICT (content): Merge conflict in .mailmap Merging hid/for-next (d7caaeda99e3 Merge branch 'for-5.10/upstream-fixes' i= nto for-next) Merging i2c/i2c/for-next (47480e8745ac Merge branch 'i2c/for-current' into = i2c/for-next) Merging i3c/i3c/next (abea14bfdebb i3c: master: Fix error return in cdns_i3= c_master_probe()) Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has= moved) Merging hwmon-staging/hwmon-next (ce15cd2cee8b hwmon: add Corsair PSU HID c= ontroller driver) Merging jc_docs/docs-next (6fee9372e0af Merge branch 'mauro-warnings' into = docs-next) Merging v4l-dvb/master (0ab4f9087ea9 media: platform: add missing put_devic= e() call in mtk_jpeg_probe() and mtk_jpeg_remove()) CONFLICT (content): Merge conflict in drivers/media/platform/marvell-ccic/m= mp-driver.c Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get ri= d of kernel-doc include) Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo = in imxfb_probe()) Merging pm/linux-next (dddc237beebb Merge branch 'pm-cpufreq-next' into lin= ux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (a43128837003 cpufreq: mediatek:= add missing platform_driver_unregister() on error in mtk_cpufreq_driver_in= it) Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offlin= e CPU information) Merging devfreq/devfreq-next (09d56d92ad25 PM / devfreq: tegra30: Silence d= eferred probe error) Merging opp/opp/linux-next (b0756034202a opp: Don't return opp_dev from _fi= nd_opp_dev()) Merging thermal/thermal/linux-next (703456ba76e9 thermal: mtk_thermal: make= device_reset optional) Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1) Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pur= e OF sensor) Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not u= sed variable 'guid') Merging dlm/next (4f2b30fd9b4b fs: dlm: fix race in nodeid2con) Merging swiotlb/linux-next (fc0021aa340a swiotlb: remove the tbl_dma_addr a= rgument to swiotlb_tbl_map_single) Merging rdma/for-next (32053e584e4a RDMA/hns: Add support for filling GMV t= able) Merging net-next/master (0356010d825e sctp: bring inet(6)_skb_parm back to = sctp_input_cb) CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c Merging bpf-next/for-next (f4c3881edbcc Merge branch 'bpf-migrate-tcp-bpf') Merging ipsec-next/master (68bb4665a2ce Merge branch 'l2-multicast-forwardi= ng-for-ocelot-switch') Merging mlx5-next/mlx5-next (3650b228f83a Linux 5.10-rc1) Merging netfilter-next/master (b65ca4c38875 Merge git://git.kernel.org/pub/= scm/linux/kernel/git/pablo/nf-next) Merging ipvs-next/master (35b7ee34abdb netfilter: nftables: Add __printf() = attribute) Merging wireless-drivers-next/master (3650b228f83a Linux 5.10-rc1) Merging bluetooth/master (44d59235ace5 Bluetooth: hci_h5: close serdev devi= ce and free hu in h5_close) Merging mac80211-next/master (b65ca4c38875 Merge git://git.kernel.org/pub/s= cm/linux/kernel/git/pablo/nf-next) Merging gfs2/for-next (da7d554f7c62 gfs2: Wake up when sd_glock_disposal be= comes zero) Merging mtd/mtd/next (232b67c39942 mtd: remove unneeded break) Merging nand/nand/next (3ebbdef13f82 mtd: rawnand: sunxi: Add MDMA support) Merging spi-nor/spi-nor/next (3650b228f83a Linux 5.10-rc1) Merging crypto/master (18d05ca4486f crypto: lib/sha256 - Unroll LOAD and BL= END loops) Merging drm/drm-next (e047c7be173c Merge tag 'drm-intel-next-queued-2020-11= -03' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) Merging amdgpu/drm-next (dce47ec66015 drm/amdgpu: Enable GPU reset for vang= ogh) CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_s= mu.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn10/= dcn10_optc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/nv.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem= .c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_dev= ice.c Applying: merge fix up for "drm/amdgpu: Add debugfs entry for printing VM i= nfo" Merging drm-intel/for-linux-next (fcc6aa8f3e96 drm/i915/ehl: Implement W/A = 22010492432) Merging drm-tegra/drm/tegra/for-next (d9f980ebcd01 drm/tegra: output: rgb: = Wrap directly-connected panel into DRM bridge) Merging drm-misc/for-linux-next (2f62f4990dca gpu: drm: bridge: analogix: a= nalogix_dp_reg: Remove unused function 'analogix_dp_write_byte_to_dpcd') CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm= /amdgpu_dm.c Applying: swiotlb: using SIZE_MAX needs limits.h included Merging drm-msm/msm-next (06d65ba3db67 dt-bindings: drm/msm/gpu: Add coolin= g device support) 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_crt= c.c Applying: drm/msm/gem: fix up for "drm/msm: Introduce GEM object funcs" Merging imx-drm/imx-drm/next (36fba366cf9f drm/imx: tve remove extraneous t= ype qualifier) Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotat= ions for context lock) Merging regmap/for-next (f243af4d473b Merge remote-tracking branch 'regmap/= for-5.11' into regmap-next) Merging sound/for-next (1a6a071f51a5 ALSA: seq: remove useless function) Merging sound-asoc/for-next (80bac27b5794 Merge remote-tracking branch 'aso= c/for-5.11' into asoc-next) Merging modules/modules-next (076aa52e4021 module: only handle errors with = the *switch* statement in module_sig_check()) Merging input/next (8a30c6eb29e0 Input: Add MAINTAINERS entry for SiS i2c t= ouch input driver) Merging block/for-next (5510f7c147da Merge branch 'for-5.11/io_uring' into = for-next) Merging device-mapper/for-next (681cc5e8667e dm: fix request-based DM to no= t bounce through indirect dm_submit_bio) Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() s= tatic) Merging mmc/next (05fc8c94791e mmc: meson-gx: drop of_match_ptr from of_dev= ice_id table) Merging mfd/for-mfd-next (bb6f6c10a8b0 mfd: madera: Add special errata rese= t handling for cs47l15) $ git reset --hard HEAD^ Merging next-20201104 version of mfd Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix i= nterpolation) Merging battery/for-next (7007fab4ae82 power: reset: POWER_RESET_OCELOT_RES= ET should depend on Ocelot or Sparx5) Merging regulator/for-next (2eb816d54b88 Merge remote-tracking branch 'regu= lator/for-5.11' into regulator-next) Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list deb= ugging warning) Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false f= or bool variable) Merging integrity/next-integrity (b000d5cb954f ima: defer arch_ima_get_secu= reboot() 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 (44141f58e143 selinux: allow dontauditx and auditallow= x rules to take effect without allowx) Merging smack/next (edd615371b66 Smack: Remove unnecessary variable initial= ization) Merging tomoyo/master (e991a40b3d00 tomoyo: Limit wildcard recursion depth.) Merging tpmdd/next (bbd521ce63ab tpm: efi: Don't create binary_bios_measure= ments 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_dat= a()) Merging audit/next (6d915476e67d audit: trigger accompanying records when n= o rules present) Merging devicetree/for-next (3cea11cd5e3b Linux 5.10-rc2) Merging mailbox/mailbox-for-next (c7dacf5b0f32 mailbox: avoid timer start f= rom callback) Merging spi/for-next (3419e5593af1 Merge remote-tracking branch 'spi/for-5.= 11' into spi-next) Merging tip/auto-latest (6f72faf4a323 Merge branch 'locking/urgent') CONFLICT (content): Merge conflict in kernel/kprobes.c Merging clockevents/timers/drivers/next (732019fef32d dt-bindings: timer: A= dd new OST support for the upcoming new driver.) Merging edac/edac-for-next (24269999027e EDAC: Fix some kernel-doc markups) Merging irqchip/irq/irqchip-next (d95bdca75b3f irqchip/ti-sci-inta: Add sup= port for unmapped event handling) Merging ftrace/for-next (e1981f75d398 ring-buffer: Update the description f= or ring_buffer_wait) Merging rcu/rcu/next (5a33ec6d5545 rcu/segcblist: Add additional comments t= o explain smp_mb()) Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused b= y 'kvm_run' cleanup) Merging kvm-arm/next (22f553842b14 KVM: arm64: Handle Asymmetric AArch32 sy= stems) Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol und= eclared warnings) Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset) Merging xen-tip/linux-next (1a89c1dc9520 Documentation: add xen.fifo_events= kernel parameter description) 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 (5c54cb6c627e platform/x86: acer-wmi: Add supp= ort for SW_TABLET_MODE on Switch devices) Merging chrome-platform/for-next (3650b228f83a Linux 5.10-rc1) 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 (0df7b988d9df char: ipmi: remove unneeded break) Merging driver-core/driver-core-next (3cea11cd5e3b Linux 5.10-rc2) Merging usb/usb-next (35ad0d901eac usb: misc: brcmstb-usb-pinmap: Fix an IS= _ERR() vs NULL check) Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in = DDMA mode.) Merging usb-serial/usb-next (975323ab8f11 USB: serial: mos7720: fix paralle= l-port state restore) Merging usb-chipidea-next/for-usb-next (4e8e3d65c0c2 usb: cdns3: Rids of du= plicate error message) Merging phy-next/next (c36f74566cef MAINTAINERS: Add entry for Qualcomm IPQ= 4019 USB PHY) CONFLICT (content): Merge conflict in MAINTAINERS Merging tty/tty-next (c35f638fc2ad vt: keyboard, use tty_insert_flip_string= in puts_queue) Merging char-misc/char-misc-next (c2192bbc3c50 mei: bus: deinitialize callb= ack functions on init failure) Merging extcon/extcon-next (54589b557a8d extcon: fsa9480: Support TI TSU611= 1 variant) Merging soundwire/next (3650b228f83a Linux 5.10-rc1) Merging thunderbolt/next (3cea11cd5e3b Linux 5.10-rc2) Merging vfio/next (2e6cfd496f5b vfio iommu type1: Fix memory leak in vfio_i= ommu_type1_pin_pages) Merging staging/staging-next (83e63b2cc416 Merge 5.10-rc2 into staging-next) Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and= remove of_match_ptr) Merging icc/icc-next (fce52ad34832 interconnect: qcom: use icc_sync state f= or sm8[12]50) Merging dmaengine/next (4749f51ddd8a dmaengine: idxd: Add ABI documentation= for shared wq) 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 (d63f64446ef4 Merge branch 'misc' into for-next) Merging scsi-mkp/for-next (151f1b664ffb scsi: ufs: Allow an error return va= lue from ->device_reset()) Merging vhost/linux-next (29ea7644edd2 swiotlb: using SIZE_MAX needs limits= .h included) Merging rpmsg/for-next (3e53119a2521 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (50afb29ae413 Merge branch 'devel' into for-next) Merging gpio-brgl/gpio/for-next (183245c4f204 gpio: rcar: Implement gpio_ch= ip.get_multiple()) Merging gpio-intel/for-next (3650b228f83a Linux 5.10-rc1) Merging pinctrl/for-next (1f955a68d179 Merge branch 'devel' into for-next) Merging pinctrl-intel/for-next (0ddebf8580fa pinctrl: lynxpoint: Unify init= call location in the code) Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: r= emove unneeded break) Merging pwm/for-next (3b1954cd57bf dt-bindings: pwm: renesas,pwm-rcar: Add = r8a7742 support) Merging userns/for-next (7fce69dff8db Implement kernel_execve) Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" = -> "Can't") Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA bu= ilds) Merging kselftest/next (b2f1c3db2887 kselftest: Extend vdso correctness tes= t to clock_gettime64) Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with= tv_nsec >=3D NSEC_PER_SEC") Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-pa= tching' into for-next) Merging coresight/next (b5882e904ce1 coresight: etb10: Fix possible NULL pt= r dereference in etb_enable_perf()) Merging rtc/rtc-next (28d211919e42 rtc: sun6i: Fix memleak in sun6i_rtc_clk= _init) 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 (38c37e8fd3d2 arm: Enable seccomp architec= ture tracking) Merging kspp/for-next/kspp (9b80e4c4ddac overflow: Add __must_check attribu= te to check_*() helpers) Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2) Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO) Merging slimbus/for-next (c3e02abdf9af slimbus: fix a kernel-doc markup) Merging nvmem/for-next (436d15fbeaee nvmem: qfprom: Don't touch certain fus= es) Merging xarray/main (fb11305101c2 XArray: Fix split documentation) Merging hyperv/hyperv-next (626b901f6044 Drivers: hv: vmbus: Add parsing of= VMbus interrupt in ACPI DSDT) Merging auxdisplay/auxdisplay (8c9108d014c5 auxdisplay: add a driver for lc= d2s character display) Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-li= ne strings) Merging pidfd/for-next (e06ce5515b74 Merge branch 'pidfd_o_nonblock' into f= or-next) Merging hmm/hmm (3650b228f83a Linux 5.10-rc1) Merging fpga/for-next (cbadbf5a53b5 Merge branch 'dfl_modularization' into = for-next) Merging kunit/test (3650b228f83a Linux 5.10-rc1) Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and d= evm_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://g= it.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7) Merging mhi/mhi-next (3650b228f83a Linux 5.10-rc1) Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sa= mple: 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.t= bl 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.t= bl 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/sysca= ll.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 (762d4d1a174c arch/ia64: Restore arch-specific pg= d_offset_k implementation) 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 (cf5ace314d35 lib/lzo/lzo1x_compress.c: make l= zogeneric1x_1_compress() static) CONFLICT (content): Merge conflict in include/linux/sched.h $ git checkout -b akpm remotes/origin/akpm/master $ git rebase --onto master remotes/origin/akpm/master-base Merging akpm/master (f7d9dc4846ac mm/gup: assert that the mmap lock is held= in __get_user_pages()) --Sig_/izEUfANREpAxV./u+4YROWG Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+k6roACgkQAVBC80lX 0GwunQf5AUFjQPXAQGyb6WNKA2VDyJOULNaLnhw3HfiReW1Pv8xxv5aZcS+YYWAs fh4sX8tzBgPK9tF4AIu/5nsrvxB/1N6NP64wMc+2fhVoWxdfJs5rSuwXnwDXIlMF elXiw8BR7/DUfr9y4UckC7I/PxcY/TGESnoOtzYwbJ3ot9kdhWXmL5KWVr0BjurC hUX1Wx5v8swE9hl5P/eGl5E7ptBy0aYbo0QOrziZoDg/PG3kxg+mC7j4Mbkg4b2h szRFBMc4YEpVkMUksIQgmgXW9SKUYieksUS+xsVyVS3gS8MFLfdWceiqJCdI5YND p7H4Dk5Ro06cqk3+dnG1819Vju16Yw== =ncpe -----END PGP SIGNATURE----- --Sig_/izEUfANREpAxV./u+4YROWG--