Merge tag 'please-pull-ia64_for_5.4' of git://git.kernel.org/pub/scm/linux/kernel...

Pull ia64 updates from Tony Luck:
 "The big change here is removal of support for SGI Altix"

* tag 'please-pull-ia64_for_5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: (33 commits)
  genirq: remove the is_affinity_mask_valid hook
  ia64: remove CONFIG_SWIOTLB ifdefs
  ia64: remove support for machvecs
  ia64: move the screen_info setup to common code
  ia64: move the ROOT_DEV setup to common code
  ia64: rework iommu probing
  ia64: remove the unused sn_coherency_id symbol
  ia64: remove the SGI UV simulator support
  ia64: remove the zx1 swiotlb machvec
  ia64: remove CONFIG_ACPI ifdefs
  ia64: remove CONFIG_PCI ifdefs
  ia64: remove the hpsim platform
  ia64: remove now unused machvec indirections
  ia64: remove support for the SGI SN2 platform
  drivers: remove the SGI SN2 IOC4 base support
  drivers: remove the SGI SN2 IOC3 base support
  qla2xxx: remove SGI SN2 support
  qla1280: remove SGI SN2 support
  misc/sgi-xp: remove SGI SN2 support
  char/mspec: remove SGI SN2 support
  ...

diff --combined Documentation/admin-guide/kernel-parameters.txt
index d31ffa110461156a8abdf2703514e57e3f42beb9,4ace5af0e9a7a70cd6ea76dacdf53e273d485ac3..0d2a67e792ed725f91bf28be9ecfb3cb1386fcd4
--- 1/Documentation/admin-guide/kernel-parameters.txt
--- 2/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -1732,11 -1732,6 +1732,11 @@@
                        Note that using this option lowers the security
                        provided by tboot because it makes the system
                        vulnerable to DMA attacks.
 +              nobounce [Default off]
 +                      Disable bounce buffer for unstrusted devices such as
 +                      the Thunderbolt devices. This will treat the untrusted
 +                      devices as the trusted ones, hence might expose security
 +                      risks of DMA attacks.
  
        intel_idle.max_cstate=  [KNL,HW,ACPI,X86]
                        0       disables intel_idle and fall back on acpi_idle.
@@@ -1816,7 -1811,7 +1816,7 @@@
                          synchronously.
  
        iommu.passthrough=
 -                      [ARM64] Configure DMA to bypass the IOMMU by default.
 +                      [ARM64, X86] Configure DMA to bypass the IOMMU by default.
                        Format: { "0" | "1" }
                        0 - Use IOMMU translation for DMA.
                        1 - Bypass the IOMMU for DMA.
@@@ -2378,7 -2373,7 +2378,7 @@@
  
        machvec=        [IA-64] Force the use of a particular machine-vector
                        (machvec) in a generic kernel.
-                       Example: machvec=hpzx1_swiotlb
+                       Example: machvec=hpzx1
  
        machtype=       [Loongson] Share the same kernel image file between different
                         yeeloong laptop.
@@@ -2609,7 -2604,7 +2609,7 @@@
                                expose users to several CPU vulnerabilities.
                                Equivalent to: nopti [X86,PPC]
                                               kpti=0 [ARM64]
 -                                             nospectre_v1 [PPC]
 +                                             nospectre_v1 [X86,PPC]
                                               nobp=0 [S390]
                                               nospectre_v2 [X86,PPC,S390,ARM64]
                                               spectre_v2_user=off [X86]
@@@ -2970,9 -2965,9 +2970,9 @@@
                        nosmt=force: Force disable SMT, cannot be undone
                                     via the sysfs control file.
  
 -      nospectre_v1    [PPC] Disable mitigations for Spectre Variant 1 (bounds
 -                      check bypass). With this option data leaks are possible
 -                      in the system.
 +      nospectre_v1    [X86,PPC] Disable mitigations for Spectre Variant 1
 +                      (bounds check bypass). With this option data leaks are
 +                      possible in the system.
  
        nospectre_v2    [X86,PPC_FSL_BOOK3E,ARM64] Disable all mitigations for
                        the Spectre variant 2 (indirect branch prediction)
@@@ -4095,13 -4090,6 +4095,13 @@@
                        Run specified binary instead of /init from the ramdisk,
                        used for early userspace startup. See initrd.
  
 +      rdrand=         [X86]
 +                      force - Override the decision by the kernel to hide the
 +                              advertisement of RDRAND support (this affects
 +                              certain AMD processors because of buggy BIOS
 +                              support, specifically around the suspend/resume
 +                              path).
 +
        rdt=            [HW,X86,RDT]
                        Turn on/off individual RDT features. List is:
                        cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,

diff --combined MAINTAINERS
index 1547e033d3547192bb5016fa4ca06f470821ab25,ffab3a4e50d61a74126a6b3c4c2eecacb02f3b5d..0e814418da0a38a5d6f48aa05c3b49f689855afa
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -183,7 -183,7 +183,7 @@@ M: Realtek linux nic maintainers <nic_s
  M:    Heiner Kallweit <hkallweit1@gmail.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/ethernet/realtek/r8169.c
 +F:    drivers/net/ethernet/realtek/r8169*
  
  8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@@ -517,6 -517,14 +517,6 @@@ W:        http://ez.analog.com/community/linux
  S:    Supported
  F:    drivers/video/backlight/adp8860_bl.c
  
 -ADS1015 HARDWARE MONITOR DRIVER
 -M:    Dirk Eibach <eibach@gdsys.de>
 -L:    linux-hwmon@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/hwmon/ads1015.rst
 -F:    drivers/hwmon/ads1015.c
 -F:    include/linux/platform_data/ads1015.h
 -
  ADT746X FAN DRIVER
  M:    Colin Leroy <colin@colino.net>
  S:    Maintained
@@@ -675,7 -683,7 +675,7 @@@ S: Maintaine
  F:    drivers/crypto/sunxi-ss/
  
  ALLWINNER VPU DRIVER
 -M:    Maxime Ripard <maxime.ripard@bootlin.com>
 +M:    Maxime Ripard <mripard@kernel.org>
  M:    Paul Kocialkowski <paul.kocialkowski@bootlin.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
@@@ -1342,7 -1350,8 +1342,7 @@@ M:      Will Deacon <will@kernel.org
  R:    Robin Murphy <robin.murphy@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/iommu/arm-smmu.c
 -F:    drivers/iommu/arm-smmu-v3.c
 +F:    drivers/iommu/arm-smmu*
  F:    drivers/iommu/io-pgtable-arm.c
  F:    drivers/iommu/io-pgtable-arm-v7s.c
  
@@@ -1399,7 -1408,7 +1399,7 @@@ S:      Maintaine
  F:    drivers/clk/sunxi/
  
  ARM/Allwinner sunXi SoC support
 -M:    Maxime Ripard <maxime.ripard@bootlin.com>
 +M:    Maxime Ripard <mripard@kernel.org>
  M:    Chen-Yu Tsai <wens@csie.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -3568,7 -3577,7 +3568,7 @@@ F:      Documentation/filesystems/caching/ca
  F:    fs/cachefiles/
  
  CADENCE MIPI-CSI2 BRIDGES
 -M:    Maxime Ripard <maxime.ripard@bootlin.com>
 +M:    Maxime Ripard <mripard@kernel.org>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/cdns,*.txt
@@@ -4281,14 -4290,6 +4281,14 @@@ S:    Supporte
  F:    drivers/cpuidle/cpuidle-exynos.c
  F:    arch/arm/mach-exynos/pm.c
  
 +CPUIDLE DRIVER - ARM PSCI
 +M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Sudeep Holla <sudeep.holla@arm.com>
 +L:    linux-pm@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Supported
 +F:    drivers/cpuidle/cpuidle-psci.c
 +
  CPU IDLE TIME MANAGEMENT FRAMEWORK
  M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
@@@ -5294,7 -5295,7 +5294,7 @@@ F:      include/linux/vga
  
  DRM DRIVERS AND MISC GPU PATCHES
  M:    Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 -M:    Maxime Ripard <maxime.ripard@bootlin.com>
 +M:    Maxime Ripard <mripard@kernel.org>
  M:    Sean Paul <sean@poorly.run>
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  S:    Maintained
@@@ -5307,7 -5308,7 +5307,7 @@@ F:      include/uapi/drm/drm
  F:    include/linux/vga*
  
  DRM DRIVERS FOR ALLWINNER A10
 -M:    Maxime Ripard  <maxime.ripard@bootlin.com>
 +M:    Maxime Ripard <mripard@kernel.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/sun4i/
@@@ -5760,11 -5761,6 +5760,11 @@@ S:    Supporte
  F:    drivers/edac/aspeed_edac.c
  F:    Documentation/devicetree/bindings/edac/aspeed-sdram-edac.txt
  
 +EDAC-BLUEFIELD
 +M:    Shravan Kumar Ramani <sramani@mellanox.com>
 +S:    Supported
 +F:    drivers/edac/bluefield_edac.c
 +
  EDAC-CALXEDA
  M:    Robert Richter <rric@kernel.org>
  L:    linux-edac@vger.kernel.org
@@@ -5789,11 -5785,10 +5789,11 @@@ F:   drivers/edac/thunderx_edac
  EDAC-CORE
  M:    Borislav Petkov <bp@alien8.de>
  M:    Mauro Carvalho Chehab <mchehab@kernel.org>
 +M:    Tony Luck <tony.luck@intel.com>
  R:    James Morse <james.morse@arm.com>
 +R:    Robert Richter <rrichter@marvell.com>
  L:    linux-edac@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
  S:    Supported
  F:    Documentation/admin-guide/ras.rst
  F:    Documentation/driver-api/edac.rst
@@@ -6070,7 -6065,7 +6070,7 @@@ M:      Florian Fainelli <f.fainelli@gmail.c
  M:    Heiner Kallweit <hkallweit1@gmail.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-bus-mdio
 +F:    Documentation/ABI/testing/sysfs-class-net-phydev
  F:    Documentation/devicetree/bindings/net/ethernet-phy.yaml
  F:    Documentation/devicetree/bindings/net/mdio*
  F:    Documentation/networking/phy.rst
@@@ -6336,11 -6331,20 +6336,11 @@@ S:   Odd Fixe
  L:    linux-block@vger.kernel.org
  F:    drivers/block/floppy.c
  
 -FMC SUBSYSTEM
 -M:    Alessandro Rubini <rubini@gnudd.com>
 -W:    http://www.ohwr.org/projects/fmc-bus
 -S:    Supported
 -F:    drivers/fmc/
 -F:    include/linux/fmc*.h
 -F:    include/linux/ipmi-fru.h
 -K:    fmc_d.*register
 -
  FPGA MANAGER FRAMEWORK
  M:    Moritz Fischer <mdf@kernel.org>
  L:    linux-fpga@vger.kernel.org
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga.git
  Q:    http://patchwork.kernel.org/project/linux-fpga/list/
  F:    Documentation/fpga/
  F:    Documentation/driver-api/fpga/
@@@ -6373,7 -6377,7 +6373,7 @@@ FRAMEBUFFER LAYE
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    dri-devel@lists.freedesktop.org
  L:    linux-fbdev@vger.kernel.org
 -T:    git git://github.com/bzolnier/linux.git
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
  S:    Maintained
  F:    Documentation/fb/
@@@ -6435,17 -6439,8 +6435,17 @@@ M:    Frank Li <Frank.li@nxp.com
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
  F:    drivers/perf/fsl_imx8_ddr_perf.c
 +F:    Documentation/admin-guide/perf/imx-ddr.rst
  F:    Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
  
 +FREESCALE IMX I2C DRIVER
 +M:    Oleksij Rempel <o.rempel@pengutronix.de>
 +R:    Pengutronix Kernel Team <kernel@pengutronix.de>
 +L:    linux-i2c@vger.kernel.org
 +S:    Maintained
 +F:    drivers/i2c/busses/i2c-imx.c
 +F:    Documentation/devicetree/bindings/i2c/i2c-imx.txt
 +
  FREESCALE IMX LPI2C DRIVER
  M:    Dong Aisheng <aisheng.dong@nxp.com>
  L:    linux-i2c@vger.kernel.org
@@@ -6729,13 -6724,6 +6729,13 @@@ W:    https://linuxtv.or
  S:    Maintained
  F:    drivers/media/radio/radio-gemtek*
  
 +GENERIC ARCHITECTURE TOPOLOGY
 +M:    Sudeep Holla <sudeep.holla@arm.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/base/arch_topology.c
 +F:    include/linux/arch_topology.h
 +
  GENERIC GPIO I2C DRIVER
  M:    Wolfram Sang <wsa+renesas@sang-engineering.com>
  S:    Supported
@@@ -6839,6 -6827,13 +6839,6 @@@ F:     Documentation/filesystems/gfs2*.tx
  F:    fs/gfs2/
  F:    include/uapi/linux/gfs2_ondisk.h
  
 -GIGASET ISDN DRIVERS
 -M:    Paul Bolle <pebolle@tiscali.nl>
 -L:    gigaset307x-common@lists.sourceforge.net
 -W:    http://gigaset307x.sourceforge.net/
 -S:    Odd Fixes
 -F:    drivers/staging/isdn/gigaset/
 -
  GNSS SUBSYSTEM
  M:    Johan Hovold <johan@kernel.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git
@@@ -7464,7 -7459,7 +7464,7 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 -F:    drivers/iommu/hyperv_iommu.c
 +F:    drivers/iommu/hyperv-iommu.c
  F:    net/vmw_vsock/hyperv_transport.c
  F:    include/clocksource/hyperv_timer.h
  F:    include/linux/hyperv.h
@@@ -7517,7 -7512,7 +7517,7 @@@ I2C MV64XXX MARVELL AND ALLWINNER DRIVE
  M:    Gregory CLEMENT <gregory.clement@bootlin.com>
  L:    linux-i2c@vger.kernel.org
  S:    Maintained
 -F:    Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
 +F:    Documentation/devicetree/bindings/i2c/marvell,mv64xxx-i2c.yaml
  F:    drivers/i2c/busses/i2c-mv64xxx.c
  
  I2C OVER PARALLEL PORT
@@@ -8054,7 -8049,6 +8054,7 @@@ S:      Maintaine
  F:    drivers/video/fbdev/i810/
  
  INTEL ASoC DRIVERS
 +M:    Cezary Rojewski <cezary.rojewski@intel.com>
  M:    Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  M:    Liam Girdwood <liam.r.girdwood@linux.intel.com>
  M:    Jie Yang <yang.jie@linux.intel.com>
@@@ -8076,13 -8070,6 +8076,13 @@@ T:    git git://git.code.sf.net/p/intel-sa
  S:    Supported
  F:    drivers/scsi/isci/
  
 +INTEL CPU family model numbers
 +M:    Tony Luck <tony.luck@intel.com>
 +M:    x86@kernel.org
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +F:    arch/x86/include/asm/intel-family.h
 +
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Jani Nikula <jani.nikula@linux.intel.com>
  M:    Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
@@@ -8389,6 -8376,12 +8389,6 @@@ F:     Documentation/x86/intel_txt.rs
  F:    include/linux/tboot.h
  F:    arch/x86/kernel/tboot.c
  
 -INTEL-MID GPIO DRIVER
 -M:    David Cohen <david.a.cohen@linux.intel.com>
 -L:    linux-gpio@vger.kernel.org
 -S:    Maintained
 -F:    drivers/gpio/gpio-intel-mid.c
 -
  INTERCONNECT API
  M:    Georgi Djakov <georgi.djakov@linaro.org>
  L:    linux-pm@vger.kernel.org
@@@ -8413,12 -8406,6 +8413,6 @@@ L:     linux-mips@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/sgi/ioc3-eth.c
  
- IOC3 SERIAL DRIVER
- M:    Pat Gefre <pfg@sgi.com>
- L:    linux-serial@vger.kernel.org
- S:    Maintained
- F:    drivers/tty/serial/ioc3_serial.c
- 
  IOMAP FILESYSTEM LIBRARY
  M:    Christoph Hellwig <hch@infradead.org>
  M:    Darrick J. Wong <darrick.wong@oracle.com>
@@@ -8428,6 -8415,7 +8422,6 @@@ L:      linux-xfs@vger.kernel.or
  L:    linux-fsdevel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
 -F:    fs/iomap.c
  F:    fs/iomap/
  F:    include/linux/iomap.h
  
@@@ -8452,6 -8440,11 +8446,6 @@@ S:     Maintaine
  F:    fs/io_uring.c
  F:    include/uapi/linux/io_uring.h
  
 -IP MASQUERADING
 -M:    Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
 -S:    Maintained
 -F:    net/ipv4/netfilter/ipt_MASQUERADE.c
 -
  IPMI SUBSYSTEM
  M:    Corey Minyard <minyard@acm.org>
  L:    openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
@@@ -8825,6 -8818,14 +8819,6 @@@ F:     virt/kvm/
  F:    tools/kvm/
  F:    tools/testing/selftests/kvm/
  
 -KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
 -M:    Joerg Roedel <joro@8bytes.org>
 -L:    kvm@vger.kernel.org
 -W:    http://www.linux-kvm.org/
 -S:    Maintained
 -F:    arch/x86/include/asm/svm.h
 -F:    arch/x86/kvm/svm.c
 -
  KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
  M:    Marc Zyngier <maz@kernel.org>
  R:    James Morse <james.morse@arm.com>
@@@ -8867,7 -8868,7 +8861,7 @@@ M:      Christian Borntraeger <borntraeger@d
  M:    Janosch Frank <frankja@linux.ibm.com>
  R:    David Hildenbrand <david@redhat.com>
  R:    Cornelia Huck <cohuck@redhat.com>
 -L:    linux-s390@vger.kernel.org
 +L:    kvm@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
@@@ -8882,11 -8883,6 +8876,11 @@@ F:    tools/testing/selftests/kvm/*/s390x
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
  M:    Paolo Bonzini <pbonzini@redhat.com>
  M:    Radim Krčmář <rkrcmar@redhat.com>
 +R:    Sean Christopherson <sean.j.christopherson@intel.com>
 +R:    Vitaly Kuznetsov <vkuznets@redhat.com>
 +R:    Wanpeng Li <wanpengli@tencent.com>
 +R:    Jim Mattson <jmattson@google.com>
 +R:    Joerg Roedel <joro@8bytes.org>
  L:    kvm@vger.kernel.org
  W:    http://www.linux-kvm.org
  T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
@@@ -8894,12 -8890,8 +8888,12 @@@ S:    Supporte
  F:    arch/x86/kvm/
  F:    arch/x86/kvm/*/
  F:    arch/x86/include/uapi/asm/kvm*
 +F:    arch/x86/include/uapi/asm/vmx.h
 +F:    arch/x86/include/uapi/asm/svm.h
  F:    arch/x86/include/asm/kvm*
  F:    arch/x86/include/asm/pvclock-abi.h
 +F:    arch/x86/include/asm/svm.h
 +F:    arch/x86/include/asm/vmx.h
  F:    arch/x86/kernel/kvm.c
  F:    arch/x86/kernel/kvmclock.c
  
@@@ -8931,7 -8923,7 +8925,7 @@@ F:      security/keys/encrypted-keys
  
  KEYS-TRUSTED
  M:    James Bottomley <jejb@linux.ibm.com>
 -M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 +M:    Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  M:    Mimi Zohar <zohar@linux.ibm.com>
  L:    linux-integrity@vger.kernel.org
  L:    keyrings@vger.kernel.org
@@@ -9227,18 -9219,6 +9221,18 @@@ F:    include/linux/nd.
  F:    include/linux/libnvdimm.h
  F:    include/uapi/linux/ndctl.h
  
 +LICENSES and SPDX stuff
 +M:    Thomas Gleixner <tglx@linutronix.de>
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +L:    linux-spdx@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git
 +F:    COPYING
 +F:    Documentation/process/license-rules.rst
 +F:    LICENSES/
 +F:    scripts/spdxcheck-test.sh
 +F:    scripts/spdxcheck.py
 +
  LIGHTNVM PLATFORM SUPPORT
  M:    Matias Bjorling <mb@lightnvm.io>
  W:    http://github/OpenChannelSSD
@@@ -11091,7 -11071,7 +11085,7 @@@ NET_FAILOVER MODUL
  M:    Sridhar Samudrala <sridhar.samudrala@intel.com>
  L:    netdev@vger.kernel.org
  S:    Supported
 -F:    driver/net/net_failover.c
 +F:    drivers/net/net_failover.c
  F:    include/net/net_failover.h
  F:    Documentation/networking/net_failover.rst
  
@@@ -11163,7 -11143,6 +11157,7 @@@ L:   netdev@vger.kernel.or
  S:    Maintained
  W:    https://fedorahosted.org/dropwatch/
  F:    net/core/drop_monitor.c
 +F:    include/uapi/linux/net_dropmon.h
  
  NETWORKING DRIVERS
  M:    "David S. Miller" <davem@davemloft.net>
@@@ -11302,7 -11281,6 +11296,7 @@@ M:   Aviad Yehezkel <aviadye@mellanox.com
  M:    Dave Watson <davejwatson@fb.com>
  M:    John Fastabend <john.fastabend@gmail.com>
  M:    Daniel Borkmann <daniel@iogearbox.net>
 +M:    Jakub Kicinski <jakub.kicinski@netronome.com>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    net/tls/*
@@@ -14483,7 -14461,6 +14477,7 @@@ F:   drivers/net/phy/phylink.
  F:    drivers/net/phy/sfp*
  F:    include/linux/phylink.h
  F:    include/linux/sfp.h
 +K:    phylink
  
  SGI GRU DRIVER
  M:    Dimitri Sivanich <sivanich@sgi.com>
@@@ -14889,9 -14866,9 +14883,9 @@@ F:   include/linux/arm_sdei.
  F:    include/uapi/linux/arm_sdei.h
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
 -M:    Shaohua Li <shli@kernel.org>
 +M:    Song Liu <song@kernel.org>
  L:    linux-raid@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/song/md.git
  S:    Supported
  F:    drivers/md/Makefile
  F:    drivers/md/Kconfig
@@@ -16106,7 -16083,7 +16100,7 @@@ S:   Maintaine
  F:    drivers/net/ethernet/ti/netcp*
  
  TI PCM3060 ASoC CODEC DRIVER
 -M:    Kirill Marinushkin <kmarinushkin@birdec.tech>
 +M:    Kirill Marinushkin <kmarinushkin@birdec.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/pcm3060.txt
@@@ -17261,7 -17238,6 +17255,7 @@@ F:   Documentation/power/regulator
  F:    drivers/regulator/
  F:    include/dt-bindings/regulator/
  F:    include/linux/regulator/
 +K:    regulator_get_optional
  
  VRF
  M:    David Ahern <dsa@cumulusnetworks.com>
@@@ -17583,6 -17559,7 +17577,6 @@@ M:   Jakub Kicinski <jakub.kicinski@netro
  M:    Jesper Dangaard Brouer <hawk@kernel.org>
  M:    John Fastabend <john.fastabend@gmail.com>
  L:    netdev@vger.kernel.org
 -L:    xdp-newbies@vger.kernel.org
  L:    bpf@vger.kernel.org
  S:    Supported
  F:    net/core/xdp.c
@@@ -17698,7 -17675,8 +17692,7 @@@ F:   include/uapi/linux/dqblk_xfs.
  F:    include/uapi/linux/fsmap.h
  
  XILINX AXI ETHERNET DRIVER
 -M:    Anirudha Sarangi <anirudh@xilinx.com>
 -M:    John Linn <John.Linn@xilinx.com>
 +M:    Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
  S:    Maintained
  F:    drivers/net/ethernet/xilinx/xilinx_axienet*
  

diff --combined arch/ia64/include/asm/iommu.h
index 92aceef63710861abc7c9605fe2c6b15105c3c97,679854fbdfc564bdc7c4142857e3e4620e3debf7..7904f591a79bc0188677aef9ca086eb97ad651dc
--- 1/arch/ia64/include/asm/iommu.h
--- 2/arch/ia64/include/asm/iommu.h
+++ b/arch/ia64/include/asm/iommu.h
@@@ -8,11 -8,12 +8,10 @@@
  extern void no_iommu_init(void);
  #ifdef        CONFIG_INTEL_IOMMU
  extern int force_iommu, no_iommu;
 -extern int iommu_pass_through;
  extern int iommu_detected;
  #else
 -#define iommu_pass_through    (0)
  #define no_iommu              (1)
  #define iommu_detected                (0)
  #endif
- extern void machvec_init(const char *name);
  
  #endif

diff --combined arch/ia64/kernel/pci-dma.c
index f5d49cd3fbb01a9933f5d547682d4adbdde2617e,7885b4a22a59e4853cfbb7a8cff75ca0498318f2..c90221733c6b91e031f0ac00758f5bbaf4cbf87a
--- 1/arch/ia64/kernel/pci-dma.c
--- 2/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@@ -10,7 -10,6 +10,6 @@@
  #include <linux/module.h>
  #include <linux/dmar.h>
  #include <asm/iommu.h>
- #include <asm/machvec.h>
  #include <linux/dma-mapping.h>
  #include <linux/kernel.h>
  #include <asm/page.h>
@@@ -22,6 -21,8 +21,6 @@@ int force_iommu __read_mostly = 1
  int force_iommu __read_mostly;
  #endif
  
 -int iommu_pass_through;
 -
  static int __init pci_iommu_init(void)
  {
        if (iommu_detected)
@@@ -32,24 -33,3 +31,3 @@@
  
  /* Must execute after PCI subsystem */
  fs_initcall(pci_iommu_init);
- 
- void __init pci_iommu_alloc(void)
- {
-       /*
-        * The order of these functions is important for
-        * fall-back/fail-over reasons
-        */
-       detect_intel_iommu();
- 
- #ifdef CONFIG_SWIOTLB
-       if (!iommu_detected) {
- #ifdef CONFIG_IA64_GENERIC
-               printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
-               machvec_init("dig");
-               swiotlb_dma_init();
- #else
-               panic("Unable to find Intel IOMMU");
- #endif /* CONFIG_IA64_GENERIC */
-       }
- #endif /* CONFIG_SWIOTLB */
- }

diff --combined drivers/char/Kconfig
index 2794f4b3f62db6f0cd0472ff1d04c708e63e48b3,96156c729a31887039f74edd0288294b5eef4dc9..df0fc997dc3e302e5a184924bc7fb8f6d4b10585
--- 1/drivers/char/Kconfig
--- 2/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -26,28 -26,6 +26,6 @@@ config DEVKME
          kind of kernel debugging operations.
          When in doubt, say "N".
  
- config SGI_SNSC
-       bool "SGI Altix system controller communication support"
-       depends on (IA64_SGI_SN2 || IA64_GENERIC)
-       help
-         If you have an SGI Altix and you want to enable system
-         controller communication from user space (you want this!),
-         say Y.  Otherwise, say N.
- 
- config SGI_TIOCX
-        bool "SGI TIO CX driver support"
-        depends on (IA64_SGI_SN2 || IA64_GENERIC)
-        help
-          If you have an SGI Altix and you have fpga devices attached
-          to your TIO, say Y here, otherwise say N.
- 
- config SGI_MBCS
-        tristate "SGI FPGA Core Services driver support"
-        depends on SGI_TIOCX
-        help
-          If you have an SGI Altix with an attached SABrick
-          say Y or M here, otherwise say N.
- 
  source "drivers/tty/serial/Kconfig"
  source "drivers/tty/serdev/Kconfig"
  
@@@ -573,12 -551,3 +551,12 @@@ config RANDOM_TRUST_CP
        has not installed a hidden back door to compromise the CPU's
        random number generation facilities. This can also be configured
        at boot with "random.trust_cpu=on/off".
 +
 +config RANDOM_TRUST_BOOTLOADER
 +      bool "Trust the bootloader to initialize Linux's CRNG"
 +      help
 +      Some bootloaders can provide entropy to increase the kernel's initial
 +      device randomness. Say Y here to assume the entropy provided by the
 +      booloader is trustworthy so it will be added to the kernel's entropy
 +      pool. Otherwise, say N here so it will be regarded as device input that
 +      only mixes the entropy pool.

diff --combined drivers/iommu/Kconfig
index a4ddeade8ac4d72691d13f1a351f8b688e00509d,9a618459d0677cc64f5c62b5c20b5d3b241b6240..e3842eabcfdd66560dc5c1e33af4011d10944562
--- 1/drivers/iommu/Kconfig
--- 2/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@@ -177,12 -177,11 +177,12 @@@ config DMAR_TABL
  
  config INTEL_IOMMU
        bool "Support for Intel IOMMU using DMA Remapping Devices"
-       depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)
+       depends on PCI_MSI && ACPI && (X86 || IA64)
        select IOMMU_API
        select IOMMU_IOVA
        select NEED_DMA_MAP_STATE
        select DMAR_TABLE
 +      select SWIOTLB
        help
          DMA remapping (DMAR) devices support enables independent address
          translations for Direct Memory Access (DMA) from devices.

diff --combined drivers/misc/Kconfig
index 16900357afc25a7d65a9a717c14de156b6fe7c28,4ef2b751410c6d547ea4747c7d2afe449dd80c6e..45b61b8d84426a9ed78342fdc280eaf5c37677b9
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -126,18 -126,6 +126,6 @@@ config INTEL_MID_PT
          an Intel Atom (non-netbook) mobile device containing a MIPI
          P1149.7 standard implementation.
  
- config SGI_IOC4
-       tristate "SGI IOC4 Base IO support"
-       depends on PCI
-       ---help---
-         This option enables basic support for the IOC4 chip on certain
-         SGI IO controller cards (IO9, IO10, and PCI-RT).  This option
-         does not enable any specific functions on such a card, but provides
-         necessary infrastructure for other drivers to utilize.
- 
-         If you have an SGI Altix with an IOC4-based card say Y.
-         Otherwise say N.
- 
  config TIFM_CORE
        tristate "TI Flash Media interface support"
        depends on PCI
@@@ -200,9 -188,8 +188,8 @@@ config ENCLOSURE_SERVICE
  config SGI_XP
        tristate "Support communication between SGI SSIs"
        depends on NET
-       depends on (IA64_GENERIC || IA64_SGI_SN2 || IA64_SGI_UV || X86_UV) && SMP
-       select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
-       select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
+       depends on (IA64_SGI_UV || X86_UV) && SMP
+       depends on X86_64 || BROKEN
        select SGI_GRU if X86_64 && SMP
        ---help---
          An SGI machine can be divided into multiple Single System
@@@ -465,7 -452,6 +452,7 @@@ config PCI_ENDPOINT_TES
  
  config XILINX_SDFEC
        tristate "Xilinx SDFEC 16"
 +      depends on HAS_IOMEM
        help
          This option enables support for the Xilinx SDFEC (Soft Decision
          Forward Error Correction) driver. This enables a char driver

diff --combined include/linux/pci_ids.h
index 4b97f427cc929972de59bcd4b1de5531ea56e16a,85e2ca611d42bedda496ab18d6cc48e90cc7a259..24486f405f12d6564019360bdafed369fe181cc8
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -548,7 -548,6 +548,7 @@@
  #define PCI_DEVICE_ID_AMD_17H_DF_F3   0x1463
  #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
  #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493
 +#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
  #define PCI_DEVICE_ID_AMD_CNB17H_F3   0x1703
  #define PCI_DEVICE_ID_AMD_LANCE               0x2000
  #define PCI_DEVICE_ID_AMD_LANCE_HOME  0x2001
@@@ -1071,7 -1070,6 +1071,6 @@@
  #define PCI_VENDOR_ID_SGI             0x10a9
  #define PCI_DEVICE_ID_SGI_IOC3                0x0003
  #define PCI_DEVICE_ID_SGI_LITHIUM     0x1002
- #define PCI_DEVICE_ID_SGI_IOC4                0x100a
  
  #define PCI_VENDOR_ID_WINBOND         0x10ad
  #define PCI_DEVICE_ID_WINBOND_82C105  0x0105

diff --combined kernel/fork.c
index 0ad65a932936d62ea5dd82f2e48c74bc31b2ffc6,f79e3da0caaf091219073516e5c5cf9ed1ff4a5c..1d1cd06edbc178daa6347b85b447af3bf83e8d90
--- 1/kernel/fork.c
--- 2/kernel/fork.c
+++ b/kernel/fork.c
@@@ -768,6 -768,7 +768,7 @@@ static void set_max_threads(unsigned in
  int arch_task_struct_size __read_mostly;
  #endif
  
+ #ifndef CONFIG_ARCH_TASK_STRUCT_ALLOCATOR
  static void task_struct_whitelist(unsigned long *offset, unsigned long *size)
  {
        /* Fetch thread_struct whitelist for the architecture. */
@@@ -782,6 -783,7 +783,7 @@@
        else
                *offset += offsetof(struct task_struct, thread);
  }
+ #endif /* CONFIG_ARCH_TASK_STRUCT_ALLOCATOR */
  
  void __init fork_init(void)
  {
@@@ -1690,14 -1692,6 +1692,14 @@@ static inline void rcu_copy_process(str
  #endif /* #ifdef CONFIG_TASKS_RCU */
  }
  
 +struct pid *pidfd_pid(const struct file *file)
 +{
 +      if (file->f_op == &pidfd_fops)
 +              return file->private_data;
 +
 +      return ERR_PTR(-EBADF);
 +}
 +
  static int pidfd_release(struct inode *inode, struct file *file)
  {
        struct pid *pid = file->private_data;
@@@ -2346,8 -2340,6 +2348,8 @@@ struct mm_struct *copy_init_mm(void
   *
   * It copies the process, and if successful kick-starts
   * it and waits for it to finish using the VM if required.
 + *
 + * args->exit_signal is expected to be checked for sanity by the caller.
   */
  long _do_fork(struct kernel_clone_args *args)
  {
@@@ -2572,14 -2564,6 +2574,14 @@@ noinline static int copy_clone_args_fro
        if (copy_from_user(&args, uargs, size))
                return -EFAULT;
  
 +      /*
 +       * Verify that higher 32bits of exit_signal are unset and that
 +       * it is a valid signal
 +       */
 +      if (unlikely((args.exit_signal & ~((u64)CSIGNAL)) ||
 +                   !valid_signal(args.exit_signal)))
 +              return -EINVAL;
 +
        *kargs = (struct kernel_clone_args){
                .flags          = args.flags,
                .pidfd          = u64_to_user_ptr(args.pidfd),