Skip to content
  1. Feb 14, 2019
  2. Feb 13, 2019
    • Chuck Lever's avatar
      SUNRPC: Display symbolic flag names in RPC trace events · 6f701383
      Chuck Lever authored
      
      
      Human-readable flags make it easier to observe RPC scheduling
      decisions and other operational details.
      
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      6f701383
    • Chuck Lever's avatar
      xprtrdma: Reduce the doorbell rate (Receive) · e340c2d6
      Chuck Lever authored
      
      
      Post RECV WRs in batches to reduce the hardware doorbell rate per
      transport. This helps the RPC-over-RDMA client scale better in
      number of transports.
      
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      e340c2d6
    • Chuck Lever's avatar
      xprtrdma: Check inline size before providing a Write chunk · d4550bbe
      Chuck Lever authored
      
      
      In very rare cases, an NFS READ operation might predict that the
      non-payload part of the RPC Call is large. For instance, an
      NFSv4 COMPOUND with a large GETATTR result, in combination with a
      large Kerberos credential, could push the non-payload part to be
      several kilobytes.
      
      If the non-payload part is larger than the connection's inline
      threshold, the client is required to provision a Reply chunk. The
      current Linux client does not check for this case. There are two
      obvious ways to handle it:
      
      a. Provision a Write chunk for the payload and a Reply chunk for
         the non-payload part
      
      b. Provision a Reply chunk for the whole RPC Reply
      
      Some testing at a recent NFS bake-a-thon showed that servers can
      mostly handle a. but there are some corner cases that do not work
      yet. b. already works (it has to, to handle krb5i/p), but could be
      somewhat less efficient. However, I expect this scenario to be very
      rare -- no-one has reported a problem yet.
      
      So I'm going to implement b. Sometime later I will provide some
      patches to help make b. a little more efficient by more carefully
      choosing the Reply chunk's segment sizes to ensure the payload is
      optimally aligned.
      
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      d4550bbe
    • Chuck Lever's avatar
      xprtrdma: Fix sparse warnings · ec482cc1
      Chuck Lever authored
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:375:63: warning: incorrect type in argument 5 (different base types)
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:375:63:    expected unsigned int [usertype] xid
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:375:63:    got restricted __be32 [usertype] rq_xid
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:432:62: warning: incorrect type in argument 5 (different base types)
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:432:62:    expected unsigned int [usertype] xid
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:432:62:    got restricted __be32 [usertype] rq_xid
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:489:62: warning: incorrect type in argument 5 (different base types)
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:489:62:    expected unsigned int [usertype] xid
      linux/net/sunrpc/xprtrdma/rpc_rdma.c:489:62:    got restricted __be32 [usertype] rq_xid
      
      Fixes: 0a93fbcb
      
       ("xprtrdma: Plant XID in on-the-wire RDMA ... ")
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      ec482cc1
  3. Feb 11, 2019
    • Linus Torvalds's avatar
      Linux 5.0-rc6 · d1393711
      Linus Torvalds authored
      v5.0-rc6
      d1393711
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-fix-5.0-rc6' of git://git.infradead.org/users/vkoul/slave-dma · 68d94a84
      Linus Torvalds authored
      Pull dmaengine fixes from Vinod Koul:
       - Fix in at_xdmac fr wrongful channel state
       - Fix for imx driver for wrong callback invocation
       - Fix to bcm driver for interrupt race & transaction abort.
       - Fix in dmatest to abort in mapping error
      
      * tag 'dmaengine-fix-5.0-rc6' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: dmatest: Abort test in case of mapping error
        dmaengine: bcm2835: Fix abort of transactions
        dmaengine: bcm2835: Fix interrupt race on RT
        dmaengine: imx-dma: fix wrong callback invoke
        dmaengine: at_xdmac: Fix wrongfull report of a channel as in use
      68d94a84
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · aadaa806
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "A handful of fixes:
      
         - Fix an MCE corner case bug/crash found via MCE injection testing
      
         - Fix 5-level paging boot crash
      
         - Fix MCE recovery cache invalidation bug
      
         - Fix regression on Xen guests caused by a recent PMD level mremap
           speedup optimization"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Make set_pmd_at() paravirt aware
        x86/mm/cpa: Fix set_mce_nospec()
        x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting
        x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()
      aadaa806
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 73a4c521
      Linus Torvalds authored
      Pull irq fixes from Ingo Molnar:
       "irqchip driver fixes: most of them are race fixes for ARM GIC (General
        Interrupt Controller) variants, but also a fix for the ARM MMP
        (Marvell PXA168 et al) irqchip affecting OLPC keyboards"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/gic-v3-its: Fix ITT_entry_size accessor
        irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable
        irqchip/gic-v3-its: Gracefully fail on LPI exhaustion
        irqchip/gic-v3-its: Plug allocation race for devices sharing a DevID
        irqchip/gic-v4: Fix occasional VLPI drop
      73a4c521
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 212146f0
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "A couple of kernel side fixes:
      
         - Fix the Intel uncore driver on certain hardware configurations
      
         - Fix a CPU hotplug related memory allocation bug
      
         - Remove a spurious WARN()
      
        ... plus also a handful of perf tooling fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf script python: Add Python3 support to tests/attr.py
        perf trace: Support multiple "vfs_getname" probes
        perf symbols: Filter out hidden symbols from labels
        perf symbols: Add fallback definitions for GELF_ST_VISIBILITY()
        tools headers uapi: Sync linux/in.h copy from the kernel sources
        perf clang: Do not use 'return std::move(something)'
        perf mem/c2c: Fix perf_mem_events to support powerpc
        perf tests evsel-tp-sched: Fix bitwise operator
        perf/core: Don't WARN() for impossible ring-buffer sizes
        perf/x86/intel: Delay memory deallocation until x86_pmu_dead_cpu()
        perf/x86/intel/uncore: Add Node ID mask
      212146f0
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d2a6aae9
      Linus Torvalds authored
      Pull locking fixes from Ingo Molnar:
       "An rtmutex (PI-futex) deadlock scenario fix, plus a locking
        documentation fix"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        futex: Handle early deadlock return correctly
        futex: Fix barrier comment
      d2a6aae9
  4. Feb 10, 2019
    • Juergen Gross's avatar
      x86/mm: Make set_pmd_at() paravirt aware · 20e55bc1
      Juergen Gross authored
      set_pmd_at() calls native_set_pmd() unconditionally on x86. This was
      fine as long as only huge page entries were written via set_pmd_at(),
      as Xen pv guests don't support those.
      
      Commit 2c91bd4a ("mm: speed up mremap by 20x on large regions")
      introduced a usage of set_pmd_at() possible on pv guests, leading to
      failures like:
      
      BUG: unable to handle kernel paging request at ffff888023e26778
      #PF error: [PROT] [WRITE]
      RIP: e030:move_page_tables+0x7c1/0xae0
      move_vma.isra.3+0xd1/0x2d0
      __se_sys_mremap+0x3c6/0x5b0
       do_syscall_64+0x49/0x100
      entry_SYSCALL_64_after_hwframe+0x44/0xa9
      
      Make set_pmd_at() paravirt aware by just letting it use set_pmd().
      
      Fixes: 2c91bd4a
      
       ("mm: speed up mremap by 20x on large regions")
      Reported-by: default avatarSander Eikelenboom <linux@eikelenboom.it>
      Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Cc: xen-devel@lists.xenproject.org
      Cc: boris.ostrovsky@oracle.com
      Cc: sstabellini@kernel.org
      Cc: hpa@zytor.com
      Cc: bp@alien8.de
      Cc: torvalds@linux-foundation.org
      Link: https://lkml.kernel.org/r/20190210074056.11842-1-jgross@suse.com
      20e55bc1
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · df3865f8
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "One PM related driver bugfix and a MAINTAINERS update"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        MAINTAINERS: Update the ocores i2c bus driver maintainer, etc
        i2c: omap: Use noirq system sleep pm ops to idle device for suspend
      df3865f8
    • Linus Torvalds's avatar
      Merge tag 'mips_fixes_5.0_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux · e8b50608
      Linus Torvalds authored
      Pull MIPS fixes from Paul Burton:
       "A batch of MIPS fixes for 5.0, nothing too scary.
      
         - A workaround for a Loongson 3 CPU bug is the biggest change, but
           still fairly straightforward. It adds extra memory barriers (sync
           instructions) around atomics to avoid a CPU bug that can break
           atomicity.
      
         - Loongson64 also sees a fix for powering off some systems which
           would incorrectly reboot rather than waiting for the power down
           sequence to complete.
      
         - We have DT fixes for the Ingenic JZ4740 SoC & the JZ4780-based Ci20
           board, and a DT warning fix for the Nexsys4/MIPSfpga board.
      
         - The Cavium Octeon platform sees a further fix to the behaviour of
           the pcie_disable command line argument that was introduced in v3.3.
      
         - The VDSO, introduced in v4.4, sees build fixes for configurations
           of GCC that were built using the --with-fp-32= flag to specify a
           default 32-bit floating point ABI.
      
         - get_frame_info() sees a fix for configurations with
           CONFIG_KALLSYMS=n, for which it previously always returned an
           error.
      
         - If the MIPS Coherence Manager (CM) reports an error then we'll now
           clear that error correctly so that the GCR_ERROR_CAUSE register
           will be updated with information about any future errors"
      
      * tag 'mips_fixes_5.0_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
        mips: cm: reprime error cause
        mips: loongson64: remove unreachable(), fix loongson_poweroff().
        MIPS: Remove function size check in get_frame_info()
        MIPS: Use lower case for addresses in nexys4ddr.dts
        MIPS: Loongson: Introduce and use loongson_llsc_mb()
        MIPS: VDSO: Include $(ccflags-vdso) in o32,n32 .lds builds
        MIPS: VDSO: Use same -m%-float cflag as the kernel proper
        MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled
        DTS: CI20: Fix bugs in ci20's device tree.
        MIPS: DTS: jz4740: Correct interrupt number of DMA core
      e8b50608
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20190209' of git://git.kernel.dk/linux-block · e5a8a116
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
      
       - NVMe pull request from Christoph, fixing namespace locking when
         dealing with the effects log, and a rapid add/remove issue (Keith)
      
       - blktrace tweak, ensuring requests with -1 sectors are shown (Jan)
      
       - link power management quirk for a Smasung SSD (Hans)
      
       - m68k nfblock dynamic major number fix (Chengguang)
      
       - series fixing blk-iolatency inflight counter issue (Liu)
      
       - ensure that we clear ->private when setting up the aio kiocb (Mike)
      
       - __find_get_block_slow() rate limit print (Tetsuo)
      
      * tag 'for-linus-20190209' of git://git.kernel.dk/linux-block:
        blk-mq: remove duplicated definition of blk_mq_freeze_queue
        Blk-iolatency: warn on negative inflight IO counter
        blk-iolatency: fix IO hang due to negative inflight counter
        blktrace: Show requests without sector
        fs: ratelimit __find_get_block_slow() failure message.
        m68k: set proper major_num when specifying module param major_num
        libata: Add NOLPM quirk for SAMSUNG MZ7TE512HMHP-000L1 SSD
        nvme-pci: fix rapid add remove sequence
        nvme: lock NS list changes while handling command effects
        aio: initialize kiocb private in case any filesystems expect it.
      e5a8a116
    • Linus Torvalds's avatar
      Merge tag 'mtd/fixes-for-5.0-rc6' of git://git.infradead.org/linux-mtd · 5610789a
      Linus Torvalds authored
      Pull mtd fixes from Boris Brezillon:
      
       - Fix a problem with the imx28 ECC engine
      
       - Remove a debug trace introduced in 2b6f0090 ("mtd: Check
         add_mtd_device() ret code")
      
       - Make sure partitions of size 0 can be registered
      
       - Fix kernel-doc warning in the rawnand core
      
       - Fix the error path of spinand_init() (missing manufacturer cleanup in
         a few places)
      
       - Address a problem with the SPI NAND PROGRAM LOAD operation which does
         not work as expected on some parts.
      
      * tag 'mtd/fixes-for-5.0-rc6' of git://git.infradead.org/linux-mtd:
        mtd: rawnand: gpmi: fix MX28 bus master lockup problem
        mtd: Make sure mtd->erasesize is valid even if the partition is of size 0
        mtd: Remove a debug trace in mtdpart.c
        mtd: rawnand: fix kernel-doc warnings
        mtd: spinand: Fix the error/cleanup path in spinand_init()
        mtd: spinand: Handle the case where PROGRAM LOAD does not reset the cache
      5610789a
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 3e5e692f
      Linus Torvalds authored
      Pull xen fixes from Juergen Gross:
       "Two very minor fixes: one remove of a #include for an unused header
        and a fix of the xen ML address in MAINTAINERS"
      
      * tag 'for-linus-5.0-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        MAINTAINERS: unify reference to xen-devel list
        arch/arm/xen: Remove duplicate header
      3e5e692f
  5. Feb 09, 2019
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo-5.0-20190205' of... · 3bb26006
      Ingo Molnar authored
      
      Merge tag 'perf-urgent-for-mingo-5.0-20190205' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
      perf trace:
      
        Arnaldo Carvalho de Melo:
      
          Fix handling of probe:vfs_getname when the probed routine is
          inlined in multiple places, fixing the collection of the 'filename'
          parameter in open syscalls.
      
      perf test:
      
        Gustavo A. R. Silva:
      
          Fix bitwise operator usage in evsel-tp-sched test, which made tat
          test always detect fields as signed.
      
        Jiri Olsa:
      
          Filter out hidden symbols from labels, added in systems where the
          annobin plugin is used, such as RHEL8, which, if left in place make
          the DWARF unwind 'perf test' to fail on PPC.
      
        Tony Jones:
      
          Fix 'perf_event_attr' tests when building with python3.
      
      perf mem/c2c:
      
        Ravi Bangoria:
      
          Fix perf_mem_events on PowerPC.
      
      tools headers UAPI:
      
        Arnaldo Carvalho de Melo:
      
          Sync linux/in.h copy from the kernel sources, silencing a perf build warning.
      
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      3bb26006
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 46c291e2
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "This is a bit larger than normal, as we had not managed to send out a
        pull request before traveling for a week without my signing key.
      
        There are multiple code fixes for older bugs, all of which should get
        backported into stable kernels:
      
         - tango: one fix for multiplatform configurations broken on other
           platforms when tango is enabled
      
         - arm_scmi: device unregistration fix
      
         - iop32x: fix kernel oops from extraneous __init annotation
      
         - pxa: remove a double kfree
      
         - fsl qbman: close an interrupt clearing race
      
        The rest is the usual collection of smaller fixes for device tree
        files, on the renesas, allwinner, meson, omap, davinci, qualcomm and
        imx platforms.
      
        Some of these are for compile-time warnings, most are for board
        specific functionality that fails to work because of incorrect
        settings"
      
      * tag 'armsoc-fixes-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (30 commits)
        ARM: tango: Improve ARCH_MULTIPLATFORM compatibility
        firmware: arm_scmi: provide the mandatory device release callback
        ARM: iop32x/n2100: fix PCI IRQ mapping
        arm64: dts: add msm8996 compatible to gicv3
        ARM: dts: am335x-shc.dts: fix wrong cd pin level
        ARM: dts: n900: fix mmc1 card detect gpio polarity
        ARM: dts: omap3-gta04: Fix graph_port warning
        ARM: pxa: ssp: unneeded to free devm_ allocated data
        ARM: dts: r8a7743: Convert to new LVDS DT bindings
        soc: fsl: qbman: avoid race in clearing QMan interrupt
        arm64: dts: renesas: r8a77965: Enable DMA for SCIF2
        arm64: dts: renesas: r8a7796: Enable DMA for SCIF2
        arm64: dts: renesas: r8a774a1: Enable DMA for SCIF2
        ARM: dts: da850: fix interrupt numbers for clocksource
        dt-bindings: imx8mq: Number clocks consecutively
        arm64: dts: meson: Fix mmc cd-gpios polarity
        ARM: dts: imx6sx: correct backward compatible of gpt
        ARM: dts: imx: replace gpio-key,wakeup with wakeup-source property
        ARM: dts: vf610-bk4: fix incorrect #address-cells for dspi3
        ARM: dts: meson8m2: mxiii-plus: mark the SD card detection GPIO active-low
        ...
      46c291e2
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 5bb513ed
      Linus Torvalds authored
      Pull arm64 fixes from Will Deacon:
       "Two arm64 fixes for -rc6. They resolve a kernel NULL dereference in
        kexec and bogus kernel page table dumping when userspace is configured
        for 52-bit virtual addressing.
      
        Summary:
      
         - Fix kernel oops when attemping kexec_file() with a NULL cmdline
      
         - Fix page table output in debugfs when ARM64_USER_VA_BITS_52=y"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: kexec_file: handle empty command-line
        arm64: ptdump: Don't iterate kernel page tables using PTRS_PER_PXX
      5bb513ed
    • Linus Torvalds's avatar
      Merge tag 'powerpc-5.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 820828bf
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "Just two fixes, both going to stable.
      
         - Our support for split pmd page table lock had a bug which could
           lead to a crash on mremap() when using the Radix MMU (Power9 only).
      
         - A fix for the PAPR SCM driver (nvdimm) we added last release, which
           had a bug where we might mis-handle a hypervisor response leading
           to us failing to attach the memory region.
      
        Thanks to: Aneesh Kumar K.V, Oliver O'Halloran"
      
      * tag 'powerpc-5.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/papr_scm: Use the correct bind address
        powerpc/radix: Fix kernel crash with mremap()
      820828bf
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 6b2912ce
      Linus Torvalds authored
      Pull signal fixes from Eric Biederman:
       "This contains four small fixes for signal handling. A missing range
        check, a regression fix, prioritizing signals we have already started
        a signal group exit for, and better detection of synchronous signals.
      
        The confused decision of which signals to handle failed spectacularly
        when a timer was pointed at SIGBUS and the stack overflowed. Resulting
        in an unkillable process in an infinite loop instead of a SIGSEGV and
        core dump"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        signal: Better detection of synchronous signals
        signal: Always notice exiting tasks
        signal: Always attempt to allocate siginfo for SIGSTOP
        signal: Make siginmask safe when passed a signal of 0
      6b2912ce
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 3b6e8204
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "This is a set of five minor fixes (although, tecnhincally, the aicxxx
        fix is for a major problem in that the driver won't load without it,
        but I think the fact it's taken us since 4.10 to discover this
        indicates that the user base for these things has declined)"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: cxlflash: Prevent deadlock when adapter probe fails
        Revert "scsi: libfc: Add WARN_ON() when deleting rports"
        scsi: sd_zbc: Fix zone information messages
        scsi: target: make the pi_prot_format ConfigFS path readable
        scsi: aic94xx: fix module loading
      3b6e8204
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 2e277fa0
      Linus Torvalds authored
      Pull IOMMU fix from Joerg Roedel:
       "Intel decided to leave the newly added Scalable Mode Feature
        default-disabled for now. The patch here accomplishes that"
      
      * tag 'iommu-fixes-v5.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/vt-d: Leave scalable mode default off
      2e277fa0
    • Linus Torvalds's avatar
      Merge tag 'pci-v5.0-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 70be9ac2
      Linus Torvalds authored
      Pull PCI fix from Bjorn Helgaas:
       "Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX) that
        breaks PCIe on I.MX SoCs (Thinh Nguyen)"
      
      * tag 'pci-v5.0-fixes-4' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Work around Synopsys duplicate Device ID (HAPS USB3, NXP i.MX)
      70be9ac2