1. 09 May, 2019 40 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 9b6c9e96
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Here we go:
      
         - Fix various long standing issues in the sparc 32-bit IOMMU support
           code, from Christoph Hellwig.
      
         - Various other code cleanups and simplifications all over. From
           Gustavo A. R. Silva, Jagadeesh Pagadala, Masahiro Yamada, Mauro
           Carvalho Chehab, Mike Rapoport"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: simplify reduce_memory() function
        sparc: use struct_size() in kzalloc()
        docs: sparc: convert to ReST
        sparc/iommu: merge iommu_get_one and __sbus_iommu_map_page
        sparc/iommu: use __sbus_iommu_map_page to implement the map_sg path
        sparc/iommu: fix __sbus_iommu_map_page for highmem pages
        sparc/iommu: move per-page flushing into __sbus_iommu_map_page
        sparc/iommu: pass a physical address to iommu_get_one
        sparc/iommu: create a common helper for map_sg
        sparc/iommu: merge iommu_release_one and sbus_iommu_unmap_page
        sparc/iommu: use sbus_iommu_unmap_page in sbus_iommu_unmap_sg
        sparc/iommu: use !PageHighMem to check if a page has a kernel mapping
        sparc: vdso: add FORCE to the build rule of %.so
        arch:sparc:kernel/uprobes.c : Remove duplicate header
      9b6c9e96
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · ea5aee6d
      Linus Torvalds authored
      Pull clk framework updates from Stephen Boyd:
       "We have a couple new features and changes in the core clk framework
        this time around because we've finally gotten around to fixing some
        long standing issues. There's still work to do though, so this pull
        request is largely laying down the foundation for all the driver
        changes to come in the next merge window.
      
        The first problem we're alleviating is how parents of clks are
        specified. With the new method, we should see lots of drivers migrate
        away from the current design of string comparisons on the entire clk
        tree to a more direct method where they can use clk_hw pointers or
        more localized names specified in DT or via clkdev. This should reduce
        our reliance on string comparisons for all the topology description
        logic that we've been using for years and hopefully speed some things
        up while avoiding problems we have with generating clk names.
      
        Beyond that we also got rid of the CLK_IS_BASIC flag because it wasn't
        really helping anyone and we introduced big-endian versions of the
        basic clk types so that we can get rid of clk_{readl,writel}(). Both
        of these are things that driver developers have tried to use over the
        years that I typically bat away during code reviews because they're
        not useful. It's great to see these two things go away so maintainers
        can save time not worrying about these things.
      
        On the driver side we got the usual collection of new SoC support and
        non-critical fixes and updates to existing code. The big topics that
        stand out are the new driver support for Mediatek MT8183 and MT8516
        SoCs, Amlogic Meson8b and G12a SoCs, and the SiFive FU540 SoC. The
        other patches in the driver pile are mostly fixes for things that are
        being used for the first time or additions for clks that couldn't be
        tested before because there wasn't a consumer driver that exercised
        them. Details are below and also in the sub-maintainer tags.
      
        Core:
         - Remove clk_readl() and introduce BE versions of basic clk types
         - Rewrite how clk parents can be specified to allow DT/clkdev lookups
         - Removal of the CLK_IS_BASIC clk flag
         - Framework documentation updates and fixes
      
        New Drivers:
         - Support for STM32F769
         - AT91 sam9x60 PMC support
         - SiFive FU540 PRCI and PLL support
         - Qualcomm QCS404 CDSP clk support
         - Qualcomm QCS404 Turing clk support
         - Mediatek MT8183 clock support
         - Mediatek MT8516 clock support
         - Milbeaut M10V clk controller support
         - Support for Cirrus Logic Lochnagar clks
      
        Updates:
         - Rework AT91 sckc DT bindings
         - Fix slow RC oscillator issue on sama5d3
         - Mark UFS clk as critical on Hi-Silicon hi3660 SoCs
         - Various static analysis fixes/finds and const markings
         - Video Engine (ECLK) support on Aspeed SoCs
         - Xilinx ZynqMP Versal platform support
         - Convert Xilinx ZynqMP driver to be struct oriented
         - Fixes for Rockchip rk3328 and rk3288 SoCs
         - Sub-type for Rockchip SoCs where mux and divider aren't a single register
         - Remove SNVS clock from i.MX7UPL clock driver and bindings
         - Improve i.MX5 clock driver for i.MX50 support
         - Addition of ADC clock definition for Exynos 5410 SoC (Odroid XU)
         - Export a new clock for the MBUS controller on the A13
         - Allwinner H6 fixes to support a finer clocking of the video and VPU engines
         - Add g12a support in the Amlogic axg audio clock controller
         - Add missing PCI USB clock on Rensas RZ/N1
         - Add Z2 (Cortex-A53) clocks on Rensas R-Car E3 and RZ/G2E
         - A new helper DIV64_U64_ROUND_CLOSEST() in <linux/math64.h>
         - VPU and Video Decoder clocks on Amlogic Meson8b
         - Finally remove the wrong ABP Meson8b clock id
         - Add Video Decoder, PCIe PLL, and CPU Clocks on Amlogic G12A
         - Re-expose SAR_ADC_SEL and CTS_OSCIN on Amlogic G12A AO clock controller
         - Un-expose some Amlogic AXG-Audio input clocks IDs"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (172 commits)
        clk: Cache core in clk_fetch_parent_index() without names
        clk: imx: correct pfdv2 gate_bit/vld_bit operations
        clk: sifive: add a driver for the SiFive FU540 PRCI IP block
        clk: analogbits: add Wide-Range PLL library
        clk: imx: clk-pllv3: mark expected switch fall-throughs
        clk: imx8mq: Add dsi_ipg_div
        clk: imx: pllv4: add fractional-N pll support
        clk: sunxi-ng: Use the correct style for SPDX License Identifier
        clk: sprd: Use the correct style for SPDX License Identifier
        clk: renesas: Use the correct style for SPDX License Identifier
        clk: qcom: Use the correct style for SPDX License Identifier
        clk: davinci: Use the correct style for SPDX License Identifier
        clk: actions: Use the correct style for SPDX License Identifier
        clk: imx: keep uart clock on during system boot
        clk: imx: correct i.MX7D AV PLL num/denom offset
        dt-bindings: clk: add documentation for the SiFive PRCI driver
        clk: stm32mp1: Add ddrperfm clock
        clk: Remove CLK_IS_BASIC clk flag
        clock: milbeaut: Add Milbeaut M10V clock controller
        dt-bindings: clock: milbeaut: add Milbeaut clock description
        ...
      ea5aee6d
    • Linus Torvalds's avatar
      Merge tag 'rtc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 8e4ff713
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "A huge series from me this cycle. I went through many drivers to set
        the date and time range supported by the RTC which helps solving HW
        limitation when the time comes (as early as next year for some). This
        time, I focused on drivers using .set_mms and .set_mmss64, allowing me
        to remove those callbacks. About a third of the patches got reviews, I
        actually own the RTCs and I tested another third and the remaining one
        are unlikely to cause any issues.
      
        Other than that, a single new driver and the usual fixes here and there.
      
        Summary:
      
        Subsystem:
      
         - set_mmss and set_mmss64 rtc_ops removal
      
         - Fix timestamp value for RTC_TIMESTAMP_BEGIN_1900
      
         - Use SPDX identifier for the core
      
         - validate upper bound of tm->tm_year
      
        New driver:
      
         - Aspeed BMC SoC RTC
      
        Drivers:
      
         - abx80x: use rtc_add_group
      
         - ds3232: nvram support
      
         - pcf85063: add alarm, nvram, offset correction and microcrystal
           rv8263 support
      
         - x1205: add of_match_table
      
         - Use set_time instead of set_mms/set_mmss64 for: ab3100, coh901331,
           digicolor, ds1672, ds2404, ep93xx, imxdi, jz4740, lpc32xx, mc13xxx,
           mxc, pcap, stmp3xxx, test, wm831x, xgene.
      
         - Set RTC range for: ab3100, at91sam9, coh901331, da9063, digicolor,
           dm355evm, ds1672, ds2404, ep39xx, goldfish, imxdi, jz4740, lpc32xx,
           mc13xxx, mv, mxc, omap, pcap, pcf85063, pcf85363, ps3, sh,
           stmp3xxx, sun4v, tegra, wm831x, xgene.
      
         - Switch to rtc_time64_to_tm/rtc_tm_to_time64 for the driver that
           properly set the RTC range.
      
         - Use dev_get_drvdata instead of multiple indirections"
      
      * tag 'rtc-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (177 commits)
        rtc: snvs: Use __maybe_unused instead of #if CONFIG_PM_SLEEP
        rtc: imxdi: remove unused variable
        rtc: drop set_mms and set_mmss64
        rtc: pcap: convert to SPDX identifier
        rtc: pcap: use .set_time
        rtc: pcap: switch to rtc_time64_to_tm/rtc_tm_to_time64
        rtc: pcap: set range
        rtc: digicolor: convert to SPDX identifier
        rtc: digicolor: use .set_time
        rtc: digicolor: set range
        rtc: digicolor: fix possible race condition
        rtc: jz4740: convert to SPDX identifier
        rtc: jz4740: rework invalid time detection
        rtc: jz4740: use dev_pm_set_wake_irq() to simplify code
        rtc: jz4740: use .set_time
        rtc: jz4740: remove useless check
        rtc: jz4740: switch to rtc_time64_to_tm/rtc_tm_to_time64
        rtc: jz4740: set range
        rtc: 88pm860x: prevent use-after-free on device remove
        rtc: Use dev_get_drvdata()
        ...
      8e4ff713
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 45182e4e
      Linus Torvalds authored
      Pull i2c updates from Wolfram Sang:
      
       - API for late atomic transfers (e.g. to shut down via PMIC). We have a
         seperate callback now which is called under clearly defined
         conditions. In-kernel users are converted, too.
      
       - new driver for the AMD PCIe MP2 I2C controller
      
       - large refactoring for at91 and bcm-iproc (both gain slave support due
         to this)
      
       - and a good share of various driver improvements anf fixes
      
      * 'i2c/for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (57 commits)
        dt-bindings: i2c: riic: document r7s9210 support
        i2c: imx-lpi2c: Use __maybe_unused instead of #if CONFIG_PM_SLEEP
        i2c-piix4: Add Hygon Dhyana SMBus support
        i2c: core: apply 'is_suspended' check for SMBus, too
        i2c: core: ratelimit 'transfer when suspended' errors
        i2c: iproc: Change driver to use 'BIT' macro
        i2c: riic: Add Runtime PM support
        i2c: mux: demux-pinctrl: use struct_size() in devm_kzalloc()
        i2c: mux: pca954x: allow management of device idle state via sysfs
        i2c: mux: pca9541: remove support for unused platform data
        i2c: mux: pca954x: remove support for unused platform data
        dt-bindings: i2c: i2c-mtk: add support for MT8516
        i2c: axxia: use auto cmd for last message
        i2c: gpio: flag atomic capability if possible
        i2c: algo: bit: add flag to whitelist atomic transfers
        i2c: stu300: use xfer_atomic callback to bail out early
        i2c: ocores: enable atomic xfers
        i2c: ocores: refactor setup for polling
        i2c: tegra-bpmp: convert to use new atomic callbacks
        i2c: omap: Add the master_xfer_atomic hook
        ...
      45182e4e
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-5.2-1' of git://git.linux-nfs.org/projects/anna/linux-nfs · 06cbd26d
      Linus Torvalds authored
      Pull NFS client updates from Anna Schumaker:
       "Highlights include:
      
        Stable bugfixes:
         - Fall back to MDS if no deviceid is found rather than aborting   # v4.11+
         - NFS4: Fix v4.0 client state corruption when mount
      
        Features:
         - Much improved handling of soft mounts with NFS v4.0:
             - Reduce risk of false positive timeouts
             - Faster failover of reads and writes after a timeout
             - Added a "softerr" mount option to return ETIMEDOUT instead of
               EIO to the application after a timeout
         - Increase number of xprtrdma backchannel requests
         - Add additional xprtrdma tracepoints
         - Improved send completion batching for xprtrdma
      
        Other bugfixes and cleanups:
         - Return -EINVAL when NFS v4.2 is passed an invalid dedup mode
         - Reduce usage of GFP_ATOMIC pages in SUNRPC
         - Various minor NFS over RDMA cleanups and bugfixes
         - Use the correct container namespace for upcalls
         - Don't share superblocks between user namespaces
         - Various other container fixes
         - Make nfs_match_client() killable to prevent soft lockups
         - Don't mark all open state for recovery when handling recallable
           state revoked flag"
      
      * tag 'nfs-for-5.2-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (69 commits)
        SUNRPC: Rebalance a kref in auth_gss.c
        NFS: Fix a double unlock from nfs_match,get_client
        nfs: pass the correct prototype to read_cache_page
        NFSv4: don't mark all open state for recovery when handling recallable state revoked flag
        SUNRPC: Fix an error code in gss_alloc_msg()
        SUNRPC: task should be exit if encode return EKEYEXPIRED more times
        NFS4: Fix v4.0 client state corruption when mount
        PNFS fallback to MDS if no deviceid found
        NFS: make nfs_match_client killable
        lockd: Store the lockd client credential in struct nlm_host
        NFS: When mounting, don't share filesystems between different user namespaces
        NFS: Convert NFSv2 to use the container user namespace
        NFSv4: Convert the NFS client idmapper to use the container user namespace
        NFS: Convert NFSv3 to use the container user namespace
        SUNRPC: Use namespace of listening daemon in the client AUTH_GSS upcall
        SUNRPC: Use the client user namespace when encoding creds
        NFS: Store the credential of the mount process in the nfs_server
        SUNRPC: Cache cred of process creating the rpc_client
        xprtrdma: Remove stale comment
        xprtrdma: Update comments that reference ib_drain_qp
        ...
      06cbd26d
    • Mike Rapoport's avatar
      sparc64: simplify reduce_memory() function · f4d9a23d
      Mike Rapoport authored
      The reduce_memory() function clampls the available memory to a limit
      defined by the "mem=" command line parameter. It takes into account the
      amount of already reserved memory and excludes it from the limit
      calculations.
      
      Rather than traverse memblocks and remove them by hand, use
      memblock_reserved_size() to account the reserved memory and
      memblock_enforce_memory_limit() to clamp the available memory.
      Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f4d9a23d
    • Gustavo A. R. Silva's avatar
      sparc: use struct_size() in kzalloc() · bc0025b6
      Gustavo A. R. Silva authored
      One of the more common cases of allocation size calculations is finding the
      size of a structure that has a zero-sized array at the end, along with memory
      for some number of elements for that array. For example:
      
      struct foo {
          int stuff;
          void *entry[];
      };
      
      instance = kzalloc(sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL);
      
      Instead of leaving these open-coded and prone to type mistakes, we can now
      use the new struct_size() helper:
      
      instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);
      
      This code was detected with the help of Coccinelle.
      Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bc0025b6
    • Linus Torvalds's avatar
      Merge branch 'for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · abde77eb
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
       "This includes Roman's cgroup2 freezer implementation.
      
        It's a separate machanism from cgroup1 freezer. Instead of blocking
        user tasks in arbitrary uninterruptible sleeps, the new implementation
        extends jobctl stop - frozen tasks are trapped in jobctl stop until
        thawed and can be killed and ptraced. Lots of thanks to Oleg for
        sheperding the effort.
      
        Other than that, there are a few trivial changes"
      
      * 'for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: never call do_group_exit() with task->frozen bit set
        kernel: cgroup: fix misuse of %x
        cgroup: get rid of cgroup_freezer_frozen_exit()
        cgroup: prevent spurious transition into non-frozen state
        cgroup: Remove unused cgrp variable
        cgroup: document cgroup v2 freezer interface
        cgroup: add tracing points for cgroup v2 freezer
        cgroup: make TRACE_CGROUP_PATH irq-safe
        kselftests: cgroup: add freezer controller self-tests
        kselftests: cgroup: don't fail on cg_kill_all() error in cg_destroy()
        cgroup: cgroup v2 freezer
        cgroup: protect cgroup->nr_(dying_)descendants by css_set_lock
        cgroup: implement __cgroup_task_count() helper
        cgroup: rename freezer.c into legacy_freezer.c
        cgroup: remove extra cgroup_migrate_finish() call
      abde77eb
    • Linus Torvalds's avatar
      Merge branch 'for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 23c97060
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "Only three commits, of which two are trivial.
      
        The non-trivial chagne is Thomas's patch to switch workqueue from
        sched RCU to regular one. The use of sched RCU is mostly historic and
        doesn't really buy us anything noticeable"
      
      * 'for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: Use normal rcu
        kernel/workqueue: Document wq_worker_last_func() argument
        kernel/workqueue: Use __printf markup to silence compiler in function 'alloc_workqueue'
      23c97060
    • Linus Torvalds's avatar
      Merge tag 'csky-for-linus-5.2-perf-unwind-libdw' of git://github.com/c-sky/csky-linux · b1e76c3d
      Linus Torvalds authored
      Pull arch/csky perf update from Guo Ren:
       "Add support for perf unwind-libdw"
      
      * tag 'csky-for-linus-5.2-perf-unwind-libdw' of git://github.com/c-sky/csky-linux:
        csky: Add support for perf unwind-libdw
      b1e76c3d
    • Chuck Lever's avatar
      SUNRPC: Rebalance a kref in auth_gss.c · 5940d1cf
      Chuck Lever authored
      Restore the kref_get that matches the gss_put_auth(gss_msg->auth)
      done by gss_release_msg().
      
      Fixes: ac83228a ("SUNRPC: Use namespace of listening daemon ...")
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      5940d1cf
    • Benjamin Coddington's avatar
      NFS: Fix a double unlock from nfs_match,get_client · c260121a
      Benjamin Coddington authored
      Now that nfs_match_client drops the nfs_client_lock, we should be
      careful
      to always return it in the same condition: locked.
      
      Fixes: 950a578c ("NFS: make nfs_match_client killable")
      Reported-by: syzbot+228a82b263b5da91883d@syzkaller.appspotmail.com
      Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      c260121a
    • Christoph Hellwig's avatar
      nfs: pass the correct prototype to read_cache_page · a46126cc
      Christoph Hellwig authored
      Fix the callbacks NFS passes to read_cache_page to actually have the
      proper type expected.  Casting around function pointers can easily
      hide typing bugs, and defeats control flow protection.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      a46126cc
    • Scott Mayhew's avatar
      NFSv4: don't mark all open state for recovery when handling recallable state revoked flag · 8ca017c8
      Scott Mayhew authored
      Only delegations and layouts can be recalled, so it shouldn't be
      necessary to recover all opens when handling the status bit
      SEQ4_STATUS_RECALLABLE_STATE_REVOKED.  We'll still wind up calling
      nfs41_open_expired() when a TEST_STATEID returns NFS4ERR_DELEG_REVOKED.
      Signed-off-by: default avatarScott Mayhew <smayhew@redhat.com>
      Reviewed-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      8ca017c8
    • Dan Carpenter's avatar
      SUNRPC: Fix an error code in gss_alloc_msg() · fe31ce83
      Dan Carpenter authored
      If kstrdup_const() then this function returns zero (success) but it
      should return -ENOMEM.
      
      Fixes: ac83228a ("SUNRPC: Use namespace of listening daemon in the client AUTH_GSS upcall")
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      fe31ce83
    • ZhangXiaoxu's avatar
      SUNRPC: task should be exit if encode return EKEYEXPIRED more times · 9c5948c2
      ZhangXiaoxu authored
      If the rpc.gssd always return cred success, but now the cred is
      expired, then the task will loop in call_refresh and call_transmit.
      
      Exit the rpc task after retry.
      Signed-off-by: default avatarZhangXiaoxu <zhangxiaoxu5@huawei.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      9c5948c2
    • ZhangXiaoxu's avatar
      NFS4: Fix v4.0 client state corruption when mount · f02f3755
      ZhangXiaoxu authored
      stat command with soft mount never return after server is stopped.
      
      When alloc a new client, the state of the client will be set to
      NFS4CLNT_LEASE_EXPIRED.
      
      When the server is stopped, the state manager will work, and accord
      the state to recover. But the state is NFS4CLNT_LEASE_EXPIRED, it
      will drain the slot table and lead other task to wait queue, until
      the client recovered. Then the stat command is hung.
      
      When discover server trunking, the client will renew the lease,
      but check the client state, it lead the client state corruption.
      
      So, we need to call state manager to recover it when detect server
      ip trunking.
      Signed-off-by: default avatarZhangXiaoxu <zhangxiaoxu5@huawei.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      f02f3755
    • Olga Kornievskaia's avatar
      PNFS fallback to MDS if no deviceid found · b1029c9b
      Olga Kornievskaia authored
      If we fail to find a good deviceid while trying to pnfs instead of
      propogating an error back fallback to doing IO to the MDS. Currently,
      code with fals the IO with EINVAL.
      Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
      Fixes: 8d40b0f1 ("NFS filelayout:call GETDEVICEINFO after pnfs_layout_process completes"
      Cc: stable@vger.kernel.org # v4.11+
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      b1029c9b
    • Linus Torvalds's avatar
      Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 800c608c
      Linus Torvalds authored
      Pull smack updates from James Morris:
       "Bug fixes for IPv6 handling and other issues and two memory use
        improvements."
      
      * 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        Smack: Fix kbuild reported build error
        smack: Check address length before reading address family
        Smack: Fix IPv6 handling of 0 secmark
        Smack: Create smack_rule cache to optimize memory usage
        smack: removal of global rule list
      800c608c
    • Linus Torvalds's avatar
      Merge branch 'next-integrity' of... · 7664cd6e
      Linus Torvalds authored
      Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
      
      Pull intgrity updates from James Morris:
       "This contains just three patches, the remainder were either included
        in other pull requests (eg. audit, lockdown) or will be upstreamed via
        other subsystems (eg. kselftests, Power).
      
        Included here is one bug fix, one documentation update, and extending
        the x86 IMA arch policy rules to coordinate the different kernel
        module signature verification methods"
      
      * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        doc/kernel-parameters.txt: Deprecate ima_appraise_tcb
        x86/ima: add missing include
        x86/ima: require signed kernel modules
      7664cd6e
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.2-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux · 88238805
      Linus Torvalds authored
      Pull orangefs updates from Mike Marshall:
       "This includes one fix and our "Orangefs through the pagecache" patch
        series which greatly improves our small IO performance and helps us
        pass more xfstests than before.
      
        Fix:
         - orangefs: truncate before updating size
      
        Pagecache series:
         - all the rest"
      
      * tag 'for-linus-5.2-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: (23 commits)
        orangefs: truncate before updating size
        orangefs: copy Orangefs-sized blocks into the pagecache if possible.
        orangefs: pass slot index back to readpage.
        orangefs: remember count when reading.
        orangefs: add orangefs_revalidate_mapping
        orangefs: implement writepages
        orangefs: write range tracking
        orangefs: avoid fsync service operation on flush
        orangefs: skip inode writeout if nothing to write
        orangefs: move do_readv_writev to direct_IO
        orangefs: do not return successful read when the client-core disappeared
        orangefs: implement writepage
        orangefs: migrate to generic_file_read_iter
        orangefs: service ops done for writeback are not killable
        orangefs: remove orangefs_readpages
        orangefs: reorganize setattr functions to track attribute changes
        orangefs: let setattr write to cached inode
        orangefs: set up and use backing_dev_info
        orangefs: hold i_lock during inode_getattr
        orangefs: update attributes rather than relying on server
        ...
      88238805
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · dce45af5
      Linus Torvalds authored
      Pull rdma updates from Jason Gunthorpe:
       "This has been a smaller cycle than normal. One new driver was
        accepted, which is unusual, and at least one more driver remains in
        review on the list.
      
        Summary:
      
         - Driver fixes for hns, hfi1, nes, rxe, i40iw, mlx5, cxgb4,
           vmw_pvrdma
      
         - Many patches from MatthewW converting radix tree and IDR users to
           use xarray
      
         - Introduction of tracepoints to the MAD layer
      
         - Build large SGLs at the start for DMA mapping and get the driver to
           split them
      
         - Generally clean SGL handling code throughout the subsystem
      
         - Support for restricting RDMA devices to net namespaces for
           containers
      
         - Progress to remove object allocation boilerplate code from drivers
      
         - Change in how the mlx5 driver shows representor ports linked to VFs
      
         - mlx5 uapi feature to access the on chip SW ICM memory
      
         - Add a new driver for 'EFA'. This is HW that supports user space
           packet processing through QPs in Amazon's cloud"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (186 commits)
        RDMA/ipoib: Allow user space differentiate between valid dev_port
        IB/core, ipoib: Do not overreact to SM LID change event
        RDMA/device: Don't fire uevent before device is fully initialized
        lib/scatterlist: Remove leftover from sg_page_iter comment
        RDMA/efa: Add driver to Kconfig/Makefile
        RDMA/efa: Add the efa module
        RDMA/efa: Add EFA verbs implementation
        RDMA/efa: Add common command handlers
        RDMA/efa: Implement functions that submit and complete admin commands
        RDMA/efa: Add the ABI definitions
        RDMA/efa: Add the com service API definitions
        RDMA/efa: Add the efa_com.h file
        RDMA/efa: Add the efa.h header file
        RDMA/efa: Add EFA device definitions
        RDMA: Add EFA related definitions
        RDMA/umem: Remove hugetlb flag
        RDMA/bnxt_re: Use core helpers to get aligned DMA address
        RDMA/i40iw: Use core helpers to get aligned DMA address within a supported page size
        RDMA/verbs: Add a DMA iterator to return aligned contiguous memory blocks
        RDMA/umem: Add API to find best driver supported page size in an MR
        ...
      dce45af5
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-5.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 055128ee
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
      
       - Updates to stm32 dma residue calculations
      
       - Interleave dma capability to axi-dmac and support for ZynqMP arch
      
       - Rework of channel assignment for rcar dma
      
       - Debugfs for pl330 driver
      
       - Support for Tegra186/Tegra194, refactoring for new chips and support
         for pause/resume
      
       - Updates to axi-dmac, bcm2835, fsl-edma, idma64, imx-sdma, rcar-dmac,
         stm32-dma etc
      
       - dev_get_drvdata() updates on few drivers
      
      * tag 'dmaengine-5.2-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (34 commits)
        dmaengine: tegra210-adma: restore channel status
        dmaengine: tegra210-dma: free dma controller in remove()
        dmaengine: tegra210-adma: add pause/resume support
        dmaengine: tegra210-adma: add support for Tegra186/Tegra194
        Documentation: DT: Add compatibility binding for Tegra186
        dmaengine: tegra210-adma: prepare for supporting newer Tegra chips
        dmaengine: at_xdmac: remove a stray bottom half unlock
        dmaengine: fsl-edma: Adjust indentation
        dmaengine: fsl-edma: Fix typo in Vybrid name
        dmaengine: stm32-dma: fix residue calculation in stm32-dma
        dmaengine: nbpfaxi: Use dev_get_drvdata()
        dmaengine: bcm-sba-raid: Use dev_get_drvdata()
        dmaengine: stm32-dma: Fix unsigned variable compared with zero
        dmaengine: stm32-dma: use platform_get_irq()
        dmaengine: rcar-dmac: Update copyright information
        dmaengine: imx-sdma: Only check ratio on parts that support 1:1
        dmaengine: xgene-dma: fix spelling mistake "descripto" -> "descriptor"
        dmaengine: idma64: Move driver name to the header
        dmaengine: bcm2835: Drop duplicate capability setting.
        dmaengine: pl330: _stop: clear interrupt status
        ...
      055128ee
    • Linus Torvalds's avatar
      Merge tag 'dma-mapping-5.2' of git://git.infradead.org/users/hch/dma-mapping · ddab5337
      Linus Torvalds authored
      Pull DMA mapping updates from Christoph Hellwig:
      
       - remove the already broken support for NULL dev arguments to the DMA
         API calls
      
       - Kconfig tidyups
      
      * tag 'dma-mapping-5.2' of git://git.infradead.org/users/hch/dma-mapping:
        dma-mapping: add a Kconfig symbol to indicate arch_dma_prep_coherent presence
        dma-mapping: remove an unnecessary NULL check
        x86/dma: Remove the x86_dma_fallback_dev hack
        dma-mapping: remove leftover NULL device support
        arm: use a dummy struct device for ISA DMA use of the DMA API
        pxa3xx-gcu: pass struct device to dma_mmap_coherent
        gbefb: switch to managed version of the DMA allocator
        da8xx-fb: pass struct device to DMA API functions
        parport_ip32: pass struct device to DMA API functions
        dma: select GENERIC_ALLOCATOR for DMA_REMAP
      ddab5337
    • Linus Torvalds's avatar
      Merge tag 'sound-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · e57ccca1
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "The most significant changes at this cycle are the Sound Open Firmware
        support from Intel for the common DSP framework along with its support
        for Intel platforms. It's a door opened to a real "free" firmware (in
        the sense of FOSS), and other parties show interests in it.
      
        In addition to SOF, we've got a bunch of updates and fixes as usual.
        Some highlights are below.
      
        ALSA core:
         - Cleanups and fixes in ALSA timer code to cover some races spotted
           by syzkaller
         - Cleanups and fixes in ALSA sequencer code to cover some races,
           again unsurprisingly, spotted by syzkaller
         - Optimize the common page allocation helper with alloc_pages_exact()
      
        ASoC:
         - Add SOF core support, as well as Intel SOF platform support
         - Generic card driver improvements: support for MCLK/sample rate
           ratio and pin switches
         - A big set of improvements to TLV320AIC32x4 drivers
         - New drivers for Freescale audio mixers, several Intel machines,
           several Mediatek machines, Meson G12A, Spreadtrum compressed audio
           and DMA devices
      
        HD-audio:
         - A few Realtek codec fixes for reducing pop noises
         - Quirks for Chromebooks
         - Workaround for faulty connection report on AMD/Nvidia HDMI
      
        Others:
         - A quirk for Focusrite Scarlett Solo USB-audio
         - Add support for MOTU 8pre FireWire
         - 24bit sample format support in aloop
         - GUS patch format support (finally, over a decade) in native emux
           synth code"
      
      * tag 'sound-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (375 commits)
        ASoC: SOF: Fix unused variable warnings
        ALSA: line6: toneport: Fix broken usage of timer for delayed execution
        ALSA: aica: Fix a long-time build breakage
        ALSA: hda/realtek - Support low power consumption for ALC256
        ASoC: stm32: i2s: update pcm hardware constraints
        ASoC: codec: hdac_hdmi: no checking monitor in hw_params
        ASoC: mediatek: mt6358: save PGA for mixer control
        ASoC: mediatek: mt6358: save output volume for mixer controls
        ASoC: mediatek: mt6358: initialize setting when ramping volume
        ASoC: SOF: core: fix undefined nocodec reference
        ASoC: SOF: xtensa: fix undefined references
        ASoC: SOF: Propagate sof_get_ctrl_copy_params() error properly
        ALSA: hdea/realtek - Headset fixup for System76 Gazelle (gaze14)
        ALSA: hda/intel: add CometLake PCI IDs
        ALSA: hda/realtek - Support low power consumption for ALC295
        ASoC: rockchip: Fix an uninitialized variable compile warning
        ASoC: SOF: Fix a compile warning with CONFIG_PCI=n
        ASoC: da7219: Fix a compile warning at CONFIG_COMMON_CLK=n
        ASoC: sound/soc/sof/: fix kconfig dependency warning
        ASoC: stm32: spdifrx: change trace level on iec control
        ...
      e57ccca1
    • Roman Gushchin's avatar
      cgroup: never call do_group_exit() with task->frozen bit set · f2b31bb5
      Roman Gushchin authored
      I've got two independent reports that cgroup_task_frozen() check
      in cgroup_exit() has been triggered by lkp libhugetlbfs-test and
      LTP ptrace01 tests.
      
      For example:
      [   44.576072] WARNING: CPU: 1 PID: 3028 at kernel/cgroup/cgroup.c:5932 cgroup_exit+0x148/0x160
      [   44.577724] Modules linked in: crct10dif_pclmul crc32_pclmul crc32c_intel ghash_clmulni_intel sr_mod cdrom
      bochs_drm sg ttm ata_generic pata_acpi ppdev drm_kms_helper snd_pcm syscopyarea aesni_intel snd_timer
      sysfillrect sysimgblt snd crypto_simd cryptd glue_helper soundcore fb_sys_fops joydev drm serio_raw pcspkr
      ata_piix libata i2c_piix4 floppy parport_pc parport ip_tables
      [   44.583106] CPU: 1 PID: 3028 Comm: ptrace-write-hu Not tainted 5.1.0-rc3-00053-g9262503 #5
      [   44.584600] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014
      [   44.586116] RIP: 0010:cgroup_exit+0x148/0x160
      [   44.587135] Code: 0f 84 50 ff ff ff 48 8b 85 c8 0c 00 00 48 8b 78 70 e8 ec 2e 00 00 e9 3b ff ff ff f0 ff 43 60
      0f 88 72 21 89 00 e9 48 ff ff ff <0f> 0b e9 1b ff ff ff e8 3c 73 f4 ff 66 90 66 2e 0f 1f 84 00 00 00
      [   44.590113] RSP: 0018:ffffb25702dcfd30 EFLAGS: 00010002
      [   44.591167] RAX: ffff96a7fee32410 RBX: ffff96a7ff1d6000 RCX: dead000000000200
      [   44.592446] RDX: ffff96a7ff1d6080 RSI: ffff96a7fec75290 RDI: ffff96a7fec75290
      [   44.593715] RBP: ffff96a7fec745c0 R08: ffff96a7fec74658 R09: 0000000000000000
      [   44.594985] R10: 0000000000000000 R11: 0000000000000001 R12: ffff96a7fec75101
      [   44.596266] R13: ffff96a7fec745c0 R14: ffff96a7ff3bde30 R15: ffff96a7fec75130
      [   44.597550] FS:  0000000000000000(0000) GS:ffff96a7dd700000(0000) knlGS:0000000000000000
      [   44.598950] CS:  0010 DS: 002b ES: 002b CR0: 0000000080050033
      [   44.600098] CR2: 00000000f7a00000 CR3: 000000000d20e000 CR4: 00000000000406e0
      [   44.601417] Call Trace:
      [   44.602777]  do_exit+0x337/0xc40
      [   44.603677]  do_group_exit+0x3a/0xa0
      [   44.604610]  get_signal+0x12e/0x8d0
      [   44.605533]  ? __switch_to_asm+0x40/0x70
      [   44.606503]  do_signal+0x36/0x650
      [   44.607409]  ? __switch_to_asm+0x40/0x70
      [   44.608383]  ? __schedule+0x267/0x860
      [   44.609329]  exit_to_usermode_loop+0x89/0xf0
      [   44.610349]  do_fast_syscall_32+0x251/0x2e3
      [   44.611357]  entry_SYSENTER_compat+0x7f/0x91
      [   44.612376] ---[ end trace e4ca5cfc4b7f7964 ]---
      
      The problem is caused by the ptrace_signal() call in the for loop
      in get_signal(). There is a cgroup_enter_frozen() call inside
      ptrace_signal(), so after exit from ptrace_signal() the task->frozen
      bit might be set. In this case do_group_exit() can be called with the
      task->frozen bit set and trigger the warning. This is only place where
      we can leave the loop with the task->frozen bit set and without
      setting JOBCTL_TRAP_FREEZE and TIF_SIGPENDING.
      
      To resolve this problem, let's move cgroup_leave_frozen(true) call to
      just after the fatal label. If the task is going to die, the frozen
      bit must be cleared no matter how we get into this point.
      Reported-by: default avatarkernel test robot <rong.a.chen@intel.com>
      Reported-by: default avatarQian Cai <cai@lca.pw>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Tejun Heo <tj@kernel.org>
      Signed-off-by: default avatarRoman Gushchin <guro@fb.com>
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      f2b31bb5
    • Mao Han's avatar
      csky: Add support for perf unwind-libdw · 3213486f
      Mao Han authored
      This patch add support for DWARF register mappings and libdw registers
      initialization, which is used by perf callchain analyzing, eg:
      
      perf record --call-graph=dwarf <COMMAND>
      
      Here is elfutils csky backend patch set:
      https://sourceware.org/ml/elfutils-devel/2019-q2/msg00007.htmlSigned-off-by: default avatarMao Han <han_mao@c-sky.com>
      Signed-off-by: default avatarGuo Ren <ren_guo@c-sky.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Arnd Bergmann <arnd@arnd.de>
      3213486f
    • Takashi Iwai's avatar
      Merge tag 'asoc-v5.2-5' of... · ed97c988
      Takashi Iwai authored
      Merge tag 'asoc-v5.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
      
      ASoC: Fixes for v5.2
      
      A bunch of driver specific fixes that came in since the initial pull
      request for v5.2, mainly warning fixes for the newly added Sound Open
      Firmware code which people appeared to only start looking at after I'd
      sent the pull request.
      ed97c988
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm · a2d635de
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This has two exciting community drivers for ARM Mali accelerators.
        Since ARM has never been open source friendly on the GPU side of the
        house, the community has had to create open source drivers for the
        Mali GPUs. Lima covers the older t4xx and panfrost the newer 6xx/7xx
        series. Well done to all involved and hopefully this will help ARM
        head in the right direction.
      
        There is also now the ability if you don't have any of the legacy
        drivers enabled (pre-KMS) to remove all the pre-KMS support code from
        the core drm, this saves 10% or so in codesize on my machine.
      
        i915 also enable Icelake/Elkhart Lake Gen11 GPUs by default, vboxvideo
        moves out of staging.
      
        There are also some rcar-du patches which crossover with media tree
        but all should be acked by Mauro.
      
        Summary:
      
        uapi changes:
         - Colorspace connector property
         - fourcc - new YUV formts
         - timeline sync objects initially merged
         - expose FB_DAMAGE_CLIPS to atomic userspace
      
        new drivers:
         - vboxvideo: moved out of staging
         - aspeed: ASPEED SoC BMC chip display support
         - lima: ARM Mali4xx GPU acceleration driver support
         - panfrost: ARM Mali6xx/7xx Midgard/Bitfrost acceleration driver support
      
        core:
         - component helper docs
         - unplugging fixes
         - devm device init
         - MIPI/DSI rate control
         - shmem backed gem objects
         - connector, display_info, edid_quirks cleanups
         - dma_buf fence chain support
         - 64-bit dma-fence seqno comparison fixes
         - move initial fb config code to core
         - gem fence array helpers for Lima
         - ability to remove legacy support code if no drivers requires it (removes 10% of drm.ko size)
         - lease fixes
      
        ttm:
         - unified DRM_FILE_PAGE_OFFSET handling
         - Account for kernel allocations in kernel zone only
      
        panel:
         - OSD070T1718-19TS panel support
         - panel-tpo-td028ttec1 backlight support
         - Ronbo RB070D30 MIPI/DSI
         - Feiyang FY07024DI26A30-D MIPI-DSI panel
         - Rocktech jh057n00900 MIPI-DSI panel
      
        i915:
         - Comet Lake (Gen9) PCI IDs
         - Updated Icelake PCI IDs
         - Elkhartlake (Gen11) support
         - DP MST property addtions
         - plane and watermark fixes
         - Icelake port sync and VEBOX disable fixes
         - struct_mutex usage reduction
         - Icelake gamma fix
         - GuC reset fixes
         - make mmap more asynchronous
         - sound display power well race fixes
         - DDI/MIPI-DSI clocks for Icelake
         - Icelake RPS frequency changing support
         - Icelake workarounds
      
        amdgpu:
         - Use HMM for userptr
         - vega20 experimental smu11 support
         - RAS support for vega20
         - BACO support for vega12 + fixes for vega20
         - reworked IH interrupt handling
         - amdkfd RAS support
         - Freesync improvements
         - initial timeline sync object support
         - DC Z ordering fixes
         - NV12 planes support
         - colorspace properties for planes=
         - eDP opts if eDP already initialized
      
        nouveau:
         - misc fixes
      
        etnaviv:
         - misc fixes
      
        msm:
         - GPU zap shader support expansion
         - robustness ABI addition
      
        exynos:
         - Logging cleanups
      
        tegra:
         - Shared reset fix
         - CPU cache maintenance fix
      
        cirrus:
         - driver rewritten using simple helpers
      
        meson:
         - G12A support
      
        vmwgfx:
         - Resource dirtying management improvements
         - Userspace logging improvements
      
        virtio:
         - PRIME fixes
      
        rockchip:
         - rk3066 hdmi support
      
        sun4i:
         - DSI burst mode support
      
        vc4:
         - load tracker to detect underflow
      
        v3d:
         - v3d v4.2 support
      
        malidp:
         - initial Mali D71 support in komeda driver
      
        tfp410:
         - omap related improvement
      
        omapdrm:
         - drm bridge/panel support
         - drop some omap specific panels
      
        rcar-du:
         - Display writeback support"
      
      * tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm: (1507 commits)
        drm/msm/a6xx: No zap shader is not an error
        drm/cma-helper: Fix drm_gem_cma_free_object()
        drm: Fix timestamp docs for variable refresh properties.
        drm/komeda: Mark the local functions as static
        drm/komeda: Fixed warning: Function parameter or member not described
        drm/komeda: Expose bus_width to Komeda-CORE
        drm/komeda: Add sysfs attribute: core_id and config_id
        drm: add non-desktop quirk for Valve HMDs
        drm/panfrost: Show stored feature registers
        drm/panfrost: Don't scream about deferred probe
        drm/panfrost: Disable PM on probe failure
        drm/panfrost: Set DMA masks earlier
        drm/panfrost: Add sanity checks to submit IOCTL
        drm/etnaviv: initialize idle mask before querying the HW db
        drm: introduce a capability flag for syncobj timeline support
        drm: report consistent errors when checking syncobj capibility
        drm/nouveau/nouveau: forward error generated while resuming objects tree
        drm/nouveau/fb/ramgk104: fix spelling mistake "sucessfully" -> "successfully"
        drm/nouveau/i2c: Disable i2c bus access after ->fini()
        drm/nouveau: Remove duplicate ACPI_VIDEO_NOTIFY_PROBE definition
        ...
      a2d635de
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 89c3b37a
      Linus Torvalds authored
      Pull IDE update from David Miller:
       "Finally deprecate the legacy IDE layer"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: officially deprecated the legacy IDE driver
      89c3b37a
    • Takashi Iwai's avatar
      ASoC: SOF: Fix unused variable warnings · 7f6647ce
      Takashi Iwai authored
      The recent fix for the build fix caused a couple of unused variable
      compiler warnings when CONFIG_SND_SOC_SOF_NOCODEC isn't set:
        sound/soc/sof/core.c:263:6: warning: unused variable ‘ret’ [-Wunused-variable]
        sound/soc/sof/core.c:262:28: warning: unused variable ‘machine’ [-Wunused-variable]
      
      Fix them by adding another ifdef.
      
      Fixes: ce38a750 ("ASoC: SOF: core: fix undefined nocodec reference")
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      Signed-off-by: default avatarMark Brown <broonie@kernel.org>
      7f6647ce
    • Dave Airlie's avatar
      Merge tag 'drm-misc-next-fixes-2019-05-08' of... · eb85d03e
      Dave Airlie authored
      Merge tag 'drm-misc-next-fixes-2019-05-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
      
      - A handful of fixes from -next that just missed feature freeze
      - More panfrost fixes that went directly in -misc-next-fixes (various)
      - Fix searchpaths during build (Masahiro)
      - msm patch to fix the driver for chips without zap shader (Rob)
      - Fix freeing imported buffers in drm_gem_cma_free_object() (Noralf)
      
      Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
      Cc: Rob Clark <robdclark@chromium.org>
      Cc: Noralf Trønnes <noralf@tronnes.org>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      
      From: Sean Paul <sean@poorly.run>
      Link: https://patchwork.freedesktop.org/patch/msgid/20190508205153.GA91135@art_vandelay
      eb85d03e
    • Dave Airlie's avatar
      Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next · f2e8d169
      Dave Airlie authored
      This is the 2nd pull request for the malidp-next. The new patches add
      additional support for Arm Mali D71 so that it can now be enabled
      correctly and brought up on any SoC that contains the IP. From now on
      we will start focusing on adding writeback, scaling and other useful
      features to bring the driver to the same level of maturity as mali-dp.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      From: Liviu Dudau <Liviu.Dudau@arm.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20190507103712.GJ15144@e110455-lin.cambridge.arm.com
      f2e8d169
    • Mauro Carvalho Chehab's avatar
      docs: sparc: convert to ReST · 5d5db1c9
      Mauro Carvalho Chehab authored
      Rename the sparc documentation files to ReST, add an
      index for them and adjust in order to produce a nice html
      output via the Sphinx build system.
      
      There is an except from a document under oradax dir.
      It doesn't seem to make much sense to convert this one
      to ReST, so let's add it as an included document.
      
      At its new index.rst, let's add a :orphan: while this is not linked to
      the main index.rst file, in order to avoid build warnings.
      Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5d5db1c9
    • David S. Miller's avatar
      Merge branch 'sparc32-iommu-SG-list' · dac21527
      David S. Miller authored
      Christoph Hellwig says:
      
      ====================
      fix SG list handling in the sparc32 iommu driver
      
      this series fixes some long standing bugs in the sparc32 iommu driver,
      mostly the lack of handling of large sglist offsets in the map_sg
      method, but also a few other smaller bits.  These now show up all the
      time do some block layer changes in linux-next.
      ====================
      Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dac21527
    • Christoph Hellwig's avatar
      sparc/iommu: merge iommu_get_one and __sbus_iommu_map_page · 376b1371
      Christoph Hellwig authored
      There is only one caller of iommu_get_one left, so merge it into
      that one to clean things up a bit.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      376b1371
    • Christoph Hellwig's avatar
      sparc/iommu: use __sbus_iommu_map_page to implement the map_sg path · edb1f072
      Christoph Hellwig authored
      This means we handle > PAGE_SIZE offsets fine, and grow the size check
      so far only performed in the map_page path.  We lose the optimization
      to not double flush a page if it apears in multiple consecutive SG list
      entries.  But at least for block I/O those don't happen anymore since
      we properly merge in higher layers anyway.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      edb1f072
    • Christoph Hellwig's avatar
      sparc/iommu: fix __sbus_iommu_map_page for highmem pages · 7e996890
      Christoph Hellwig authored
      __sbus_iommu_map_page currently assumes all pages are mapped into the
      kernel direct mapping.  Switch to using physical address instead of
      virtual ones for all the normal mapping operations, and only use
      the virtual addresses for cache flushing when not operating on
      a highmem page.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7e996890
    • Christoph Hellwig's avatar
      sparc/iommu: move per-page flushing into __sbus_iommu_map_page · 8668b38c
      Christoph Hellwig authored
      This prepares for reusing __sbus_iommu_map_page in the map_sg path.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8668b38c
    • Christoph Hellwig's avatar
      sparc/iommu: pass a physical address to iommu_get_one · b8205942
      Christoph Hellwig authored
      No need for the page structure, just the paddr / pfn.  This is
      going to simplify fixes to the callers.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b8205942