1. 29 Aug, 2018 1 commit
    • Johan Hovold's avatar
      of: add helper to lookup compatible child node · 36156f92
      Johan Hovold authored
      Add of_get_compatible_child() helper that can be used to lookup
      compatible child nodes.
      Several drivers currently use of_find_compatible_node() to lookup child
      nodes while failing to notice that the of_find_ functions search the
      entire tree depth-first (from a given start node) and therefore can
      match unrelated nodes. The fact that these functions also drop a
      reference to the node they start searching from (e.g. the parent node)
      is typically also overlooked, something which can lead to use-after-free
      Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
      Signed-off-by: default avatarRob Herring <robh@kernel.org>
  2. 26 Aug, 2018 10 commits
    • Linus Torvalds's avatar
      Linux 4.19-rc1 · 5b394b2d
      Linus Torvalds authored
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b933d6eb
      Linus Torvalds authored
      Pull timer update from Thomas Gleixner:
       "New defines for the compat time* types so they can be shared between
        32bit and 64bit builds. Not used yet, but merging them now allows the
        actual conversions to be merged through different maintainer trees
        without dependencies
        We still have compat interfaces for 32bit on 64bit even with the new
        2038 safe timespec/val variants because pointer size is different. And
        for the old style timespec/val interfaces we need yet another 'compat'
        interface for both 32bit native and 32bit on 64bit"
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        y2038: Provide aliases for compat helpers
    • Linus Torvalds's avatar
      Merge branch 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax · aba16dc5
      Linus Torvalds authored
      Pull IDA updates from Matthew Wilcox:
       "A better IDA API:
            id = ida_alloc(ida, GFP_xxx);
            ida_free(ida, id);
        rather than the cumbersome ida_simple_get(), ida_simple_remove().
        The new IDA API is similar to ida_simple_get() but better named.  The
        internal restructuring of the IDA code removes the bitmap
        preallocation nonsense.
        I hope the net -200 lines of code is convincing"
      * 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax: (29 commits)
        ida: Change ida_get_new_above to return the id
        ida: Remove old API
        test_ida: check_ida_destroy and check_ida_alloc
        test_ida: Convert check_ida_conv to new API
        test_ida: Move ida_check_max
        test_ida: Move ida_check_leaf
        idr-test: Convert ida_check_nomem to new API
        ida: Start new test_ida module
        target/iscsi: Allocate session IDs from an IDA
        iscsi target: fix session creation failure handling
        drm/vmwgfx: Convert to new IDA API
        dmaengine: Convert...
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugins-v4.19-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · c4726e77
      Linus Torvalds authored
      Pull gcc plugin fix from Kees Cook:
       "Lift gcc test into Kconfig. This is for better behavior when the
        kernel is built with Clang, reported by Stefan Agner"
      * tag 'gcc-plugins-v4.19-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: Disable when building under Clang
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d207ea8e
      Linus Torvalds authored
      Pull perf updates from Thomas Gleixner:
         - Improve kallsyms coverage
         - Add x86 entry trampolines to kcore
         - Fix ARM SPE handling
         - Correct PPC event post processing
         - Make the build system more robust
         - Small fixes and enhancements all over the place
         - Update kernel ABI header copies
         - Preparatory work for converting libtraceevnt to a shared library
         - License cleanups"
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (100 commits)
        tools arch: Update arch/x86/lib/memcpy_64.S copy used in 'perf bench mem memcpy'
        tools arch x86: Update tools's copy of cpufeatures.h
        perf python: Fix pyrf_evlist__read_on_cpu() interface
        perf mmap: Store real cpu number in 'struct perf_mmap'
        perf tools: Remove ext from struct kmod_path
        perf tools: Add gzip_is_compressed function
        perf tools: Add lzma_is_compressed function
        perf tools: Add i...
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2a8a2b7c
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
       - Correct the L1TF fallout on 32bit and the off by one in the 'too much
         RAM for protection' calculation.
       - Add a helpful kernel message for the 'too much RAM' case
       - Unbreak the VDSO in case that the compiler desides to use indirect
         jumps/calls and emits retpolines which cannot be resolved because the
         kernel uses its own thunks, which does not work for the VDSO. Make it
         use the builtin thunks.
       - Re-export start_thread() which was unexported when the 32/64bit
         implementation was unified. start_thread() is required by modular
         binfmt handlers.
       - Trivial cleanups
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/speculation/l1tf: Suggest what to do on systems with too much RAM
        x86/speculation/l1tf: Fix off-by-one error when warning that system has too much RAM
        x86/kvm/vmx: Remove duplicate l1d flush definitions
        x86/speculation/l1tf: Fix overflow in l1tf_pfn_limit() on 32bit
        x86/process: Re-export start_thread()
        x86/mce: Add notifier_block forward declaration
        x86/vdso: Fix vDSO build if a retpoline is emitted
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · de375035
      Linus Torvalds authored
      Pull irq update from Thomas Gleixner:
       "A small set of updats/fixes for the irq subsystem:
         - Allow GICv3 interrupts to be configured as wake-up sources to
           enable wakeup from suspend
         - Make the error handling of the STM32 irqchip init function work
         - A set of small cleanups and improvements"
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/gic-v3: Allow interrupt to be configured as wake-up sources
        irqchip/tango: Set irq handler and data in one go
        dt-bindings: irqchip: renesas-irqc: Document r8a774a1 support
        irqchip/s3c24xx: Remove unneeded comparison of unsigned long to 0
        irqchip/stm32: Fix init error handling
        irqchip/bcm7038-l1: Hide cpu offline callback when building for !SMP
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a9ce3233
      Linus Torvalds authored
      Pull licking update from Thomas Gleixner:
       "Mark the switch cases which fall through to the next case with the
        proper comment so the fallthrough compiler checks can be enabled"
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        futex: Mark expected switch fall-throughs
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-4.19_dax-memory-failure' of... · 2923b27e
      Linus Torvalds authored
      Merge tag 'libnvdimm-for-4.19_dax-memory-failure' of gitolite.kernel.org:pub/scm/linux/kernel/git/nvdimm/nvdimm
      Pull libnvdimm memory-failure update from Dave Jiang:
       "As it stands, memory_failure() gets thoroughly confused by dev_pagemap
        backed mappings. The recovery code has specific enabling for several
        possible page states and needs new enabling to handle poison in dax
        In order to support reliable reverse mapping of user space addresses:
         1/ Add new locking in the memory_failure() rmap path to prevent races
            that would typically be handled by the page lock.
         2/ Since dev_pagemap pages are hidden from the page allocator and the
            "compound page" accounting machinery, add a mechanism to determine
            the size of the mapping that encompasses a given poisoned pfn.
         3/ Given pmem errors can be repaired, change the speculatively
            accessed poison protection, mce_unmap_kpfn(), to be reversible and
            otherwise allow ongoing access from the kernel.
        A side effec...
    • Linus Torvalds's avatar
      Merge tag 'libnvdimm-for-4.19_misc' of gitolite.kernel.org:pub/scm/linux/kernel/git/nvdimm/nvdimm · 828bf6e9
      Linus Torvalds authored
      Pull libnvdimm updates from Dave Jiang:
       "Collection of misc libnvdimm patches for 4.19 submission:
         - Adding support to read locked nvdimm capacity.
         - Change test code to make DSM failure code injection an override.
         - Add support for calculate maximum contiguous area for namespace.
         - Add support for queueing a short ARS when there is on going ARS for
         - Allow NULL to be passed in to ->direct_access() for kaddr and pfn
         - Improve smart injection support for nvdimm emulation testing.
         - Fix test code that supports for emulating controller temperature.
         - Fix hang on error before devm_memremap_pages()
         - Fix a bug that causes user memory corruption when data returned to
           user for ars_status.
         - Maintainer updates for Ross Zwisler emails and adding Jan Kara to
      * tag 'libnvdimm-for-4.19_misc' of gitolite.kernel.org:pub/scm/linux/kernel/gi...
  3. 25 Aug, 2018 8 commits
    • Linus Torvalds's avatar
      Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b3262720
      Linus Torvalds authored
      Pull ARM SoC late updates from Olof Johansson:
       "A couple of late-merged changes that would be useful to get in this
        merge window:
         - Driver support for reset of audio complex on Meson platforms. The
           audio driver went in this merge window, and these changes have been
           in -next for a while (just not in our tree).
         - Power management fixes for IOMMU on Rockchip platforms, getting
           closer to kexec working on them, including Chromebooks.
         - Another pass updating "arm,psci" -> "psci" for some properties that
           have snuck in since last time it was done"
      * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        iommu/rockchip: Move irq request past pm_runtime_enable
        iommu/rockchip: Handle errors returned from PM framework
        arm64: rockchip: Force CONFIG_PM on Rockchip systems
        ARM: rockchip: Force CONFIG_PM on Rockchip systems
        arm64: dts: Fix various entry-method properties to reflect documentation
        reset: imx7: Fix always writing bits as 0
        reset: meson: add meson audio arb driver
        reset: meson: add dt-bindings for meson-axg audio arb
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 1bc27677
      Linus Torvalds authored
      Pull more Kbuild updates from Masahiro Yamada:
       - add build_{menu,n,g,x}config targets for compile-testing Kconfig
       - fix and improve recursive dependency detection in Kconfig
       - fix parallel building of menuconfig/nconfig
       - fix syntax error in clang-version.sh
       - suppress distracting log from syncconfig
       - remove obsolete "rpm" target
       - remove VMLINUX_SYMBOL(_STR) macro entirely
       - fix microblaze build with CONFIG_DYNAMIC_FTRACE
       - move compiler test for dead code/data elimination to Kconfig
       - rename well-known LDFLAGS variable to KBUILD_LDFLAGS
       - misc fixes and cleanups
      * tag 'kbuild-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: rename LDFLAGS to KBUILD_LDFLAGS
        kbuild: pass LDFLAGS to recordmcount.pl
        kbuild: test dead code/data elimination support in Kconfig
        initramfs: move gen_initramfs_list.sh from scripts/ to usr/
        vmlinux.lds.h: remov...
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20180825' of git://git.kernel.dk/linux-block · b8dcdab3
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "A few small fixes for this merge window:
         - Locking imbalance fix for bcache (Shan Hai)
         - A few small fixes for wbt. One is a cleanup/prep, one is a fix for
           an existing issue, and the last two are fixes for changes that went
           into this merge window (me)"
      * tag 'for-linus-20180825' of git://git.kernel.dk/linux-block:
        blk-wbt: don't maintain inflight counts if disabled
        blk-wbt: fix has-sleeper queueing check
        blk-wbt: use wq_has_sleeper() for wq active check
        blk-wbt: move disable check into get_limit()
        bcache: release dc->writeback_lock properly in bch_writeback_thread()
    • Linus Torvalds's avatar
      Merge tag 'upstream-4.19-rc1-fix' of git://git.infradead.org/linux-ubifs · db84abf5
      Linus Torvalds authored
      Pull UBIFS fix from Richard Weinberger:
       "Remove an empty file from UBIFS source"
      * tag 'upstream-4.19-rc1-fix' of git://git.infradead.org/linux-ubifs:
        ubifs: Remove empty file.h
    • Linus Torvalds's avatar
      Merge tag '4.19-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6 · 04faac10
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Three small SMB3 fixes, one for stable"
      * tag '4.19-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: update internal module version number for cifs.ko to 2.12
        cifs: check kmalloc before use
        cifs: check if SMB2 PDU size has been padded and suppress the warning
        cifs: create a define for how many iovs we need for an SMB2_open()
    • Linus Torvalds's avatar
      mm/cow: don't bother write protecting already write-protected pages · 1b2de5d0
      Linus Torvalds authored
      This is not normally noticeable, but repeated forks are unnecessarily
      expensive because they repeatedly dirty the parent page tables during
      the page table copy operation.
      It's trivial to just avoid write protecting the page table entry if it
      was already not writable.
      This patch was inspired by
      which points to an ancient "waste time re-doing fork" issue in the
      presence of lots of signals.
      That bug was fixed by Eric Biederman's signal handling series
      culminating in commit c3ad2c3b
       ("signal: Don't restart fork when
      signals come in"), but the unnecessary work for repeated forks is still
      work just fixing, particularly since the fix is trivial.
      Cc: Eric Biederman <ebiederm@xmission.com>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Colin Ian King's avatar
      hpfs: remove unnecessary checks on the value of r when assigning error code · e0fcfe1f
      Colin Ian King authored
      At the point where r is being checked for different values, r is always
      going to be equal to 2 as the previous if statements jump to end or end1
      if r is not 2.  Hence the assignment to err can be simplified to just
      err an assignment without any checks on the value or r.
      Detected by CoverityScan, CID#1226737 ("Logically dead code")
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Reviewed-by: default avatarMikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Jens Axboe's avatar
      libata: maintainership update · 7634ccd2
      Jens Axboe authored
      Tejun Heo wrote:
      > I asked Jens whether he could take care of the libata tree and he
      > thankfully agreed, so, from now on, Jens will be the libata
      > maintainer.
      > Thanks a lot!
      Thanks for your work in this area. I still remember the first linux
      storage summit we did in Vancouver 2001, Tejun was invited to talk about
      his libata error handling work. Before that, it was basically a crap
      shoot if we recovered properly or not... A lot of water has flown under
      the bridge since then!
      Here's an "official" patch. Linus, can you apply it?
      Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
  4. 24 Aug, 2018 21 commits
    • Linus Torvalds's avatar
      Merge branch 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 05193597
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Nothing too interesting. Mostly ahci and ahci_platform changes, many
        around power management"
      * 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
        ata: ahci_platform: enable to get and control reset
        ata: libahci_platform: add reset control support
        ata: add an extra argument to ahci_platform_get_resources()
        ata: sata_rcar: Add r8a77965 support
        ata: sata_rcar: exclude setting of PHY registers in Gen3
        ata: sata_rcar: really mask all interrupts on Gen2 and later
        Revert "ata: ahci_platform: allow disabling of hotplug to save power"
        ata: libahci: Allow reconfigure of DEVSLP register
        ata: libahci: Correct setting of DEVSLP register
        ata: ahci: Enable DEVSLP by default on x86 with SLP_S0
        ata: ahci: Support state with min power but Partial low power state
        Revert "ata: ahci_platform: convert kcalloc to devm_kcalloc"
        ata: sata_rcar: Add rudimentary Runtime PM support
        ata: sata_rcar: Provide a short-hand for &pdev->dev
        ata: Only output sg element mapped number in verbose debug
        ata: Guard ata_scsi_dump_cdb() by ATA_VERBOSE_DEBUG
        ata: ahci_platform: convert kcalloc to devm_kcalloc
        ata: ahci_platform: convert kzallloc to kcalloc
        ata: ahci_platform: correct parameter documentation for ahci_platform_shutdown
        libata: remove ata_sff_data_xfer_noirq()
    • Linus Torvalds's avatar
      Merge branch 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 59676610
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
       "Just one commit from Steven to take out spin lock from trace event
      * 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup/tracing: Move taking of spin lock out of trace event handlers
    • Linus Torvalds's avatar
      Merge branch 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 9022ada8
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "Over the lockdep cross-release churn, workqueue lost some of the
        existing annotations. Johannes Berg restored it and also improved
      * 'for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: re-add lockdep dependencies for flushing
        workqueue: skip lockdep wq dependency in cancel_work_sync()
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 18b8bfdf
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       - PASID table handling updates for the Intel VT-d driver. It implements
         a global PASID space now so that applications usings multiple devices
         will just have one PASID.
       - A new config option to make iommu passthroug mode the default.
       - New sysfs attribute for iommu groups to export the type of the
         default domain.
       - A debugfs interface (for debug only) usable by IOMMU drivers to
         export internals to user-space.
       - R-Car Gen3 SoCs support for the ipmmu-vmsa driver
       - The ARM-SMMU now aborts transactions from unknown devices and devices
         not attached to any domain.
       - Various cleanups and smaller fixes all over the place.
      * tag 'iommu-updates-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (42 commits)
        iommu/omap: Fix cache flushes on L2 table entries
        iommu: Remove the ->map_sg indirection
        iommu/arm-smmu-v3: Abort all transactions if SMMU is enabled in kdump kernel
        iommu/arm-smmu-v3: Prevent any devices access to memory without registration
        iommu/ipmmu-vmsa: Don't register as BUS IOMMU if machine doesn't have IPMMU-VMSA
        iommu/ipmmu-vmsa: Clarify supported platforms
        iommu/ipmmu-vmsa: Fix allocation in atomic context
        iommu: Add config option to set passthrough as default
        iommu: Add sysfs attribyte for domain type
        iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register
        iommu/arm-smmu: Error out only if not enough context interrupts
        iommu/io-pgtable-arm-v7s: Abort allocation when table address overflows the PTE
        iommu/io-pgtable-arm: Fix pgtable allocation in selftest
        iommu/vt-d: Remove the obsolete per iommu pasid tables
        iommu/vt-d: Apply per pci device pasid table in SVA
        iommu/vt-d: Allocate and free pasid table
        iommu/vt-d: Per PCI device pasid table interfaces
        iommu/vt-d: Add for_each_device_domain() helper
        iommu/vt-d: Move device_domain_info to header
        iommu/vt-d: Apply global PASID in SVA
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · d972604f
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       - Add Daniel Lezcano as the reviewer of thermal framework and SoC
         driver changes (Daniel Lezcano).
       - Fix a bug in intel_dts_soc_thermal driver, which does not translate
         IO-APIC GSI (Global System Interrupt) into Linux irq number (Hans de
       - For device tree bindings, allow cooling devices sharing same trip
         point with same contribution value to share cooling map (Viresh
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        dt-bindings: thermal: Allow multiple devices to share cooling map
        MAINTAINERS: Add Daniel Lezcano as designated reviewer for thermal
        Thermal: Intel SoC DTS: Translate IO-APIC GSI number to linux irq number
    • Linus Torvalds's avatar
      Merge tag 'apparmor-pr-2018-08-23' of... · 57bb8e37
      Linus Torvalds authored
      Merge tag 'apparmor-pr-2018-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
      Pull apparmor updates from John Johansen:
       "There is nothing major this time just four bug fixes and a patch to
        remove some dead code:
         - remove no-op permission check in policy_unpack
        Bug fixes:
         - fix an error code in __aa_create_ns()
         - fix failure to audit context info in build_change_hat
         - check buffer bounds when mapping permissions mask
         - fully initialize aa_perms struct when answering userspace query"
      * tag 'apparmor-pr-2018-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
        apparmor: remove no-op permission check in policy_unpack
        apparmor: fix an error code in __aa_create_ns()
        apparmor: Fix failure to audit context info in build_change_hat
        apparmor: Fully initialize aa_perms struct when answering userspace query
        apparmor: Check buffer bounds when mapping permissions mask
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · aa5b1054
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       - An implementation for the newly added hv_ops->flush() for the OPAL
         hvc console driver backends, I forgot to apply this after merging the
         hvc driver changes before the merge window.
       - Enable all PCI bridges at boot on powernv, to avoid races when
         multiple children of a bridge try to enable it simultaneously. This
         is a workaround until the PCI core can be enhanced to fix the races.
       - A fix to query PowerVM for the correct system topology at boot before
         initialising sched domains, seen in some configurations to cause
         broken scheduling etc.
       - A fix for pte_access_permitted() on "nohash" platforms.
       - Two commits to fix SIGBUS when using remap_pfn_range() seen on Power9
         due to a workaround when using the nest MMU (GPUs, accelerators).
       - Another fix to the VFIO code used by KVM, the previous fix had some
         bugs which caused guests to not start in some configurations.
       - A handful of other minor fixes.
      Thanks to: Aneesh Kumar K.V, Benjamin Herrenschmidt, Christophe Leroy,
      Hari Bathini, Luke Dashjr, Mahesh Salgaonkar, Nicholas Piggin, Paul
      Mackerras, Srikar Dronamraju.
      * tag 'powerpc-4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/mce: Fix SLB rebolting during MCE recovery path.
        KVM: PPC: Book3S: Fix guest DMA when guest partially backed by THP pages
        powerpc/mm/radix: Only need the Nest MMU workaround for R -> RW transition
        powerpc/mm/books3s: Add new pte bit to mark pte temporarily invalid.
        powerpc/nohash: fix pte_access_permitted()
        powerpc/topology: Get topology for shared processors at boot
        powerpc64/ftrace: Include ftrace.h needed for enable/disable calls
        powerpc/powernv/pci: Work around races in PCI bridge enabling
        powerpc/fadump: cleanup crash memory ranges support
        powerpc/powernv: provide a console flush operation for opal hvc driver
        powerpc/traps: Avoid rate limit messages from show unhandled signals
        powerpc/64s: Fix PACA_IRQ_HARD_DIS accounting in idle_power4()
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e1dbc5a4
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       - A couple of patches for the zcrypt driver:
           + Add two masks to determine which AP cards and queues are host
             devices, this will be useful for KVM AP device passthrough
           + Add-on patch to improve the parsing of the new apmask and aqmask
           + Some code beautification
       - Second try to reenable the GCC plugins, the first patch set had a
         patch to do this but the merge somehow missed this
       - Remove the s390 specific GCC version check and use the generic one
       - Three patches for kdump, two bug fixes and one cleanup
       - Three patches for the PCI layer, one bug fix and two cleanups
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: remove gcc version check (4.3 or newer)
        s390/zcrypt: hex string mask improvements for apmask and aqmask.
        s390/zcrypt: AP bus support for alternate driver(s)
        s390/zcrypt: code beautify
        s390/zcrypt: switch return type to bool for ap_instructions_available()
        s390/kdump: Remove kzalloc_panic
        s390/kdump: Fix memleak in nt_vmcoreinfo
        s390/kdump: Make elfcorehdr size calculation ABI compliant
        s390/pci: remove fmb address from debug output
        s390/pci: remove stale rc
        s390/pci: fix out of bounds access during irq setup
        s390/zcrypt: fix ap_instructions_available() returncodes
        s390: reenable gcc plugins for real
    • Linus Torvalds's avatar
      Merge tag 'acpi-4.19-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 40c431a5
      Linus Torvalds authored
      Pull ACPI Kconfig fix from Rafael Wysocki:
       "Fix recent menuconfig breakage causing it to present ACPI-specific
        options incorrectly (Arnd Bergmann)"
      * tag 'acpi-4.19-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: fix menuconfig presentation of ACPI submenu
    • Linus Torvalds's avatar
      Merge branch 'userns-linus' of... · 4def1963
      Linus Torvalds authored
      Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
      Pull namespace fixes from Eric Biederman:
       "This is a set of four fairly obvious bug fixes:
         - a switch from d_find_alias to d_find_any_alias because the xattr
           code perversely takes a dentry
         - two mutex vs copy_to_user fixes from Jann Horn
         - a fix to use a sanitized size not the size userspace passed in from
           Christian Brauner"
      * 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        getxattr: use correct xattr length
        sys: don't hold uts_sem while accessing userspace memory
        userns: move user access out of the mutex
        cap_inode_getsecurity: use d_find_any_alias() instead of d_find_alias()
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2018-08-24' of git://anongit.freedesktop.org/drm/drm · 5e8704ac
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Just a couple of fixes"
        One MAINTAINERS address change, two panels fixes, and set of amdgpu
        fixes (build fixes, display fixes and some others)"
      * tag 'drm-next-2018-08-24' of git://anongit.freedesktop.org/drm/drm:
        drm/edid: Add 6 bpc quirk for SDC panel in Lenovo B50-80
        drm/amd/display: Don't build DCN1 when kcov is enabled
        Revert "drm/amdgpu/display: Replace CONFIG_DRM_AMD_DC_DCN1_0 with CONFIG_X86"
        drm/amdgpu/display: disable eDP fast boot optimization on DCE8
        drm/amdgpu: fix amdgpu_amdkfd_remove_eviction_fence v3
        drm/amdgpu: fix incorrect use of drm_file->pid
        drm/amdgpu: fix incorrect use of fcheck
        drm/powerplay: enable dpm under pass-through
        drm/amdgpu: access register without KIQ
        drm/amdgpu: set correct base for THM/NBIF/MP1 IP
        drm/amd/display: fix dentist did ranges
        drm/amd/display: make dp_ss_off optional
        drm/amd/display: fix dp_ss_control vbios flag parsing
        drm/amd/display: Do not retain link settings
        MAINTAINERS: drm-misc: Change seanpaul's email address
        drm/panel: simple: tv123wam: Add unprepare delay
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 019cddc8
      Linus Torvalds authored
      Pull second i2c update from Wolfram Sang:
       "As promised, here is my 2nd pull request for I2C, containing:
         - removal of the attach_adapter callback, converting its last user
         - removal of any __deprecated usage within I2C
         - one email address update
         - some SPDX conversion"
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: don't use any __deprecated handling anymore
        i2c: use SPDX identifier for Renesas drivers
        i2c: ocores: update my email address
        i2c: remove deprecated attach_adapter callback
        macintosh: therm_windtunnel: drop using attach_adapter
    • Marc Zyngier's avatar
      iommu/rockchip: Move irq request past pm_runtime_enable · 1aa55ca9
      Marc Zyngier authored
      Enabling the interrupt early, before power has been applied to the
      device, can result in an interrupt being delivered too early if:
      - the IOMMU shares an interrupt with a VOP
      - the VOP has a pending interrupt (after a kexec, for example)
      In these conditions, we end-up taking the interrupt without
      the IOMMU being ready to handle the interrupt (not powered on).
      Moving the interrupt request past the pm_runtime_enable() call
      makes sure we can at least access the IOMMU registers. Note that
      this is only a partial fix, and that the VOP interrupt will still
      be screaming until the VOP driver kicks in, which advocates for
      a more synchronized interrupt enabling/disabling approach.
      Fixes: 0f181d3c
       ("iommu/rockchip: Add runtime PM support")
      Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Marc Zyngier's avatar
      iommu/rockchip: Handle errors returned from PM framework · 3fc7c5c0
      Marc Zyngier authored
      pm_runtime_get_if_in_use can fail: either PM has been disabled
      altogether (-EINVAL), or the device hasn't been enabled yet (0).
      Sadly, the Rockchip IOMMU driver tends to conflate the two things
      by considering a non-zero return value as successful.
      This has the consequence of hiding other bugs, so let's handle this
      case throughout the driver, with a WARN_ON_ONCE so that we can try
      and work out what happened.
      Fixes: 0f181d3c
       ("iommu/rockchip: Add runtime PM support")
      Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Marc Zyngier's avatar
      arm64: rockchip: Force CONFIG_PM on Rockchip systems · 7db7a8f5
      Marc Zyngier authored
      A number of the Rockchip-specific drivers (IOMMU, display controllers)
      are now assuming that CONFIG_PM is set, and may completely misbehave
      if that's not the case.
      Since there is hardly any reason for this configuration option not
      to be selected anyway, let's require it (in the same way Tegra already
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Marc Zyngier's avatar
      ARM: rockchip: Force CONFIG_PM on Rockchip systems · d1558dfd
      Marc Zyngier authored
      A number of the Rockchip-specific drivers (IOMMU, display controllers)
      are now assuming that CONFIG_PM is set, and may completely misbehave
      if that's not the case.
      Since there is hardly any reason for this configuration option not
      to be selected anyway, let's require it (in the same way Tegra already
      Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Amit Kucheria's avatar
      arm64: dts: Fix various entry-method properties to reflect documentation · e9880240
      Amit Kucheria authored
      The idle-states binding documentation[1] mentions that the
      'entry-method' property is required on 64-bit platforms and must be
      set to "psci".
      commit a13f18f5
       ("Documentation: arm: Fix typo in the idle-states
      bindings examples") attempted to fix this earlier but clearly more is
      Fix the cpu-capacity.txt documentation that uses the incorrect value so
      we don't get copy-paste errors like these. Clarify the language in
      idle-states.txt by removing the reference to the psci bindings that
      might be causing this confusion.
      Finally, fix devicetrees of various boards to reflect current
      [1] Documentation/devicetree/bindings/arm/idle-states.txt (see
      idle-states node)
      Signed-off-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
      Acked-by: Sudeep Holla's avatarSudeep Holla <sudeep.holla@arm.com>
      Acked-by: default avatarLi Yang <leoyang.li@nxp.com>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Olof Johansson's avatar
      Merge tag 'reset-fixes-for-4.18' of git://git.pengutronix.de/git/pza/linux into next/late · 5920cce8
      Olof Johansson authored
      Reset controller fixes for v4.18
      This tag fixes reset assertion on i.MX7 for all non-inverted reset
      control bits. Currently only PCIE controller and PHY resets are used.
      * tag 'reset-fixes-for-4.18' of git://git.pengutronix.de/git/pza/linux
        reset: imx7: Fix always writing bits as 0
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Olof Johansson's avatar
      Merge tag 'reset-for-4.19-2' of git://git.pengutronix.de/git/pza/linux into next/late · c37aad36
      Olof Johansson authored
      Reset controller changes for v4.19, part 2
      This adds a single new driver for the Amlogic Meson Audio Memory Arbiter
      * tag 'reset-for-4.19-2' of git://git.pengutronix.de/git/pza/linux
        reset: meson: add meson audio arb driver
        reset: meson: add dt-bindings for meson-axg audio arb
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · d002924f
      Linus Torvalds authored
      Pull virtio updates from Michael Tsirkin:
       "virtio, vhost: fixes, tweaks
        No new features but a bunch of tweaks such as switching balloon from
        oom notifier to shrinker"
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        vhost/scsi: increase VHOST_SCSI_PREALLOC_PROT_SGLS to 2048
        vhost: allow vhost-scsi driver to be built-in
        virtio: pci-legacy: Validate queue pfn
        virtio: mmio-v1: Validate queue PFN
        virtio_balloon: replace oom notifier with shrinker
        virtio-balloon: kzalloc the vb struct
        virtio-balloon: remove BUG() in init_vqs
    • Sedat Dilek's avatar
      i2c: don't use any __deprecated handling anymore · 00efcdce
      Sedat Dilek authored
      This can be dropped with commit 771c0353
      ("deprecate the '__deprecated' attribute warnings entirely and for good")
      now in upstream.
      And we got rid of the last __deprecated use, too.
      Signed-off-by: default avatarSedat Dilek <sedat.dilek@credativ.de>
      [wsa: shortened commit message to reflect the current situation]
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>