Skip to content
Permalink
sun4i-drm-tve-…

Commits on Jul 8, 2019

  1. ARM: dts: sun7i: cubietruck: Enable VGA and composite video output

    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    wens committed Jul 8, 2019
  2. ARM: dts: sun7i: Add TV encoder device nodes

    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    wens committed Jul 8, 2019
  3. dt-bindings: display: sun4i-drm: Add description for TV encoders on A…

    …10/A20
    
    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    wens committed Jul 8, 2019
  4. Merge tag 'v5.2' into sunxi-next

    Linux 5.2
    
    # gpg: Signature made 2019¦~07¤ë08¤é (¶g¤@) 06®É42¤À04¬í CST
    # gpg:                using RSA key ABAF11C65A2970B130ABE3C479BE3E4300411886
    # gpg:                issuer "torvalds@linux-foundation.org"
    # gpg: Good signature from "Linus Torvalds <torvalds@kernel.org>" [full]
    # gpg:                 aka "Linus Torvalds <torvalds@linux-foundation.org>" [full]
    # gpg: torvalds@linux-foundation.org: Verified 6 signatures in the past 5 months.
    #      Encrypted 0 messages.
    
    # Conflicts:
    #	drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
    wens committed Jul 8, 2019

Commits on Jul 7, 2019

  1. Linux 5.2

    torvalds committed Jul 7, 2019

Commits on Jul 6, 2019

  1. Merge tag 'for-linus-20190706' of git://git.kernel.dk/linux-block

    Pull block fix from Jens Axboe:
     "Just a single fix for a patch from Greg KH, which reportedly break
      block debugfs locations for certain setups. Trivial enough that I
      think we should include it now, rather than wait and release 5.2 with
      it, since it's a regression in this series"
    
    * tag 'for-linus-20190706' of git://git.kernel.dk/linux-block:
      blk-mq: fix up placement of debugfs directory of queue files
    torvalds committed Jul 6, 2019
  2. Merge tag 'mips_fixes_5.2_2' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/mips/linux
    
    Pull MIPS fixes from Paul Burton:
     "A few more MIPS fixes:
    
       - Fix a silly typo in virt_addr_valid which led to completely bogus
         behavior (that happened to stop tripping up hardened usercopy
         despite being broken).
    
       - Fix UART parity setup on AR933x systems.
    
       - A build fix for non-Linux build machines.
    
       - Have the 'all' make target build DTBs, primarily to fit in with the
         behavior of scripts/package/builddeb.
    
       - Handle an execution hazard in TLB exceptions that use KScratch
         registers, which could inadvertently clobber the $1 register on
         some generally higher-end out-of-order CPUs.
    
       - A MAINTAINERS update to fix the path to the NAND driver for Ingenic
         systems"
    
    * tag 'mips_fixes_5.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
      MAINTAINERS: Correct path to moved files
      MIPS: Add missing EHB in mtc0 -> mfc0 sequence.
      MIPS: have "plain" make calls build dtbs for selected platforms
      MIPS: fix build on non-linux hosts
      MIPS: ath79: fix ar933x uart parity mode
      MIPS: Fix bounds check virt_addr_valid
    torvalds committed Jul 6, 2019
  3. Merge tag 'dmaengine-fix-5.2' of git://git.infradead.org/users/vkoul/…

    …slave-dma
    
    Pull dmaengine fixes from Vinod Koul:
    
     - bam_dma fix for completed descriptor count
    
     - fix for imx-sdma remove BD_INTR for channel0 and use-after-free on
       probe error path
    
     - endian bug fix in jz4780 IRQ handler
    
    * tag 'dmaengine-fix-5.2' of git://git.infradead.org/users/vkoul/slave-dma:
      dmaengine: qcom: bam_dma: Fix completed descriptors count
      dmaengine: imx-sdma: remove BD_INTR for channel0
      dmaengine: imx-sdma: fix use-after-free on probe error path
      dmaengine: jz4780: Fix an endian bug in IRQ handler
    torvalds committed Jul 6, 2019
  4. Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/jejb/scsi
    
    Pull SCSI fixes from James Bottomley:
     "Two iscsi fixes.
    
      One for an oops in the client which can be triggered by the server
      authentication protocol and the other in the target code which causes
      data corruption"
    
    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
      scsi: iscsi: set auth_protocol back to NULL if CHAP_A value is not supported
      scsi: target/iblock: Fix overrun in WRITE SAME emulation
    torvalds committed Jul 6, 2019
  5. Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/viro/vfs
    
    Pull vfs fixlet from Al Viro:
     "Fix bogus default y in Kconfig (VALIDATE_FS_PARSER)
    
      That thing should not be turned on by default, especially since it's
      not quiet in case it finds no problems. Geert has sent the obvious fix
      quite a few times, but it fell through the cracks"
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      fs: VALIDATE_FS_PARSER should default to n
    torvalds committed Jul 6, 2019
  6. blk-mq: fix up placement of debugfs directory of queue files

    When the blk-mq debugfs file creation logic was "cleaned up" it was
    cleaned up too much, causing the queue file to not be created in the
    correct location.  Turns out the check for the directory being present
    is needed as if that has not happened yet, the files should not be
    created, and the function will be called later on in the initialization
    code so that the files can be created in the correct location.
    
    Fixes: 6cfc008 ("blk-mq: no need to check return value of debugfs_create functions")
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: linux-block@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    gregkh authored and axboe committed Jul 6, 2019
  7. Revert "mm: page cache: store only head pages in i_pages"

    This reverts commit 5fd4ca2.
    
    Mikhail Gavrilov reports that it causes the VM_BUG_ON_PAGE() in
    __delete_from_swap_cache() to trigger:
    
       page:ffffd6d34dff0000 refcount:1 mapcount:1 mapping:ffff97812323a689 index:0xfecec363
       anon
       flags: 0x17fffe00080034(uptodate|lru|active|swapbacked)
       raw: 0017fffe00080034 ffffd6d34c67c508 ffffd6d3504b8d48 ffff97812323a689
       raw: 00000000fecec363 0000000000000000 0000000100000000 ffff978433ace000
       page dumped because: VM_BUG_ON_PAGE(entry != page)
       page->mem_cgroup:ffff978433ace000
       ------------[ cut here ]------------
       kernel BUG at mm/swap_state.c:170!
       invalid opcode: 0000 [#1] SMP NOPTI
       CPU: 1 PID: 221 Comm: kswapd0 Not tainted 5.2.0-0.rc2.git0.1.fc31.x86_64 #1
       Hardware name: System manufacturer System Product Name/ROG STRIX X470-I GAMING, BIOS 2202 04/11/2019
       RIP: 0010:__delete_from_swap_cache+0x20d/0x240
       Code: 30 65 48 33 04 25 28 00 00 00 75 4a 48 83 c4 38 5b 5d 41 5c 41 5d 41 5e 41 5f c3 48 c7 c6 2f dc 0f 8a 48 89 c7 e8 93 1b fd ff <0f> 0b 48 c7 c6 a8 74 0f 8a e8 85 1b fd ff 0f 0b 48 c7 c6 a8 7d 0f
       RSP: 0018:ffffa982036e7980 EFLAGS: 00010046
       RAX: 0000000000000021 RBX: 0000000000000040 RCX: 0000000000000006
       RDX: 0000000000000000 RSI: 0000000000000086 RDI: ffff97843d657900
       RBP: 0000000000000001 R08: ffffa982036e7835 R09: 0000000000000535
       R10: ffff97845e21a46c R11: ffffa982036e7835 R12: ffff978426387120
       R13: 0000000000000000 R14: ffffd6d34dff0040 R15: ffffd6d34dff0000
       FS:  0000000000000000(0000) GS:ffff97843d640000(0000) knlGS:0000000000000000
       CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
       CR2: 00002cba88ef5000 CR3: 000000078a97c000 CR4: 00000000003406e0
       Call Trace:
        delete_from_swap_cache+0x46/0xa0
        try_to_free_swap+0xbc/0x110
        swap_writepage+0x13/0x70
        pageout.isra.0+0x13c/0x350
        shrink_page_list+0xc14/0xdf0
        shrink_inactive_list+0x1e5/0x3c0
        shrink_node_memcg+0x202/0x760
        shrink_node+0xe0/0x470
        balance_pgdat+0x2d1/0x510
        kswapd+0x220/0x420
        kthread+0xfb/0x130
        ret_from_fork+0x22/0x40
    
    and it's not immediately obvious why it happens.  It's too late in the
    rc cycle to do anything but revert for now.
    
    Link: https://lore.kernel.org/lkml/CABXGCsN9mYmBD-4GaaeW_NrDu+FDXLzr_6x+XNxfmFV6QkYCDg@mail.gmail.com/
    Reported-and-bisected-by: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
    Suggested-by: Jan Kara <jack@suse.cz>
    Cc: Michal Hocko <mhocko@kernel.org>
    Cc: Vlastimil Babka <vbabka@suse.cz>
    Cc: Matthew Wilcox <willy@infradead.org>
    Cc: Kirill Shutemov <kirill@shutemov.name>
    Cc: William Kucharski <william.kucharski@oracle.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Jul 6, 2019
  8. Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

    Pull kvm fixes from Paolo Bonzini:
     "x86 bugfix patches and one compilation fix for ARM"
    
    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: arm64/sve: Fix vq_present() macro to yield a bool
      KVM: LAPIC: Fix pending interrupt in IRR blocked by software disable LAPIC
      KVM: nVMX: Change KVM_STATE_NESTED_EVMCS to signal vmcs12 is copied from eVMCS
      KVM: nVMX: Allow restore nested-state to enable eVMCS when vCPU in SMM
      KVM: x86: degrade WARN to pr_warn_ratelimited
    torvalds committed Jul 6, 2019
  9. Merge tag 'mtd/fixes-for-5.2-final' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/mtd/linux
    
    Pull mtf fixes from Miquel Raynal:
    
     - Fix the memory organization structure of a Macronix SPI-NAND chip.
    
     - Fix a build dependency wrongly described.
    
     - Fix the sunxi NAND driver for A23/A33 SoCs by (a) reverting the
       faulty commit introducing broken DMA support and (b) applying another
       commit bringing working DMA support.
    
    * tag 'mtd/fixes-for-5.2-final' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
      mtd: rawnand: sunxi: Add A23/A33 DMA support with extra MBUS configuration
      Revert "mtd: rawnand: sunxi: Add A23/A33 DMA support"
      mtd: rawnand: ingenic: Fix ingenic_ecc dependency
      mtd: spinand: Fix max_bad_eraseblocks_per_lun info in memorg
    torvalds committed Jul 6, 2019
  10. Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/wsa/linux
    
    Pull i2c fixlet from Wolfram Sang:
     "I2C has a MAINTAINERS update which will be benfitial for developers,
      so let's add it right away"
    
    * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
      i2c: tegra: Add Dmitry as a reviewer
    torvalds committed Jul 6, 2019
  11. Merge tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux

    Pull nfsd fixes from Bruce Fields:
     "Two more quick bugfixes for nfsd: fixing a regression causing mount
      failures on high-memory machines and fixing the DRC over RDMA"
    
    * tag 'nfsd-5.2-2' of git://linux-nfs.org/~bfields/linux:
      nfsd: Fix overflow causing non-working mounts on 1 TB machines
      svcrdma: Ignore source port when computing DRC hash
    torvalds committed Jul 6, 2019

Commits on Jul 5, 2019

  1. mtd: rawnand: sunxi: Add A23/A33 DMA support with extra MBUS configur…

    …ation
    
    Allwinner NAND controllers can make use of DMA to enhance the I/O
    throughput thanks to ECC pipelining. DMA handling with A23/A33 NAND IP
    is a bit different than with the older SoCs, hence the introduction of
    a new compatible to handle:
    * the differences between register offsets,
    * the burst length change from 4 to minimum 8,
    * manage SRAM accesses through MBUS with extra configuration.
    
    Fixes: c49836f ("mtd: rawnand: sunxi: Add A23/A33 DMA support")
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    miquelraynal committed Jul 5, 2019
  2. Revert "mtd: rawnand: sunxi: Add A23/A33 DMA support"

    This reverts commit c49836f.
    
    The commit is wrong and its approach actually does not work. Let's
    revert it in order to add the feature with a clean patch.
    
    Fixes: c49836f ("mtd: rawnand: sunxi: Add A23/A33 DMA support")
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    miquelraynal committed Jul 5, 2019
  3. i2c: tegra: Add Dmitry as a reviewer

    I'm contributing to Tegra's upstream development in general and happened
    to review the Tegra's I2C patches for awhile because I'm actively using
    upstream kernel on all of my Tegra-powered devices and initially some of
    the submitted patches were getting my attention since they were causing
    problems. Recently Wolfram Sang asked whether I'm interested in becoming
    a reviewer for the driver and I don't mind at all.
    
    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    [wsa: ack was expressed by Thierry Reding in a mail thread]
    Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
    digetx authored and Wolfram Sang committed Jul 5, 2019
  4. drivers: ata: ahci_sunxi: Increased SATA/AHCI DMA TX/RX FIFOs

    Increasing the SATA/AHCI DMA TX/RX FIFOs (P0DMACR.TXTS and .RXTS, ie.
    TX_TRANSACTION_SIZE and RX_TRANSACTION_SIZE) from default 0x0 each
    to 0x3 each, gives a write performance boost of 120 MiB/s to 132 MiB/s
    from lame 36 MiB/s to 45 MiB/s previously.
    Read performance is above 200 MiB/s.
    [tested on SSD using dd bs=4K/8K/12K/16K/20K/24K/32K: peak-perf at 12K]
    
    Tested on the SBCs Banana Pi R1 (aka Lamobo R1) and Banana Pi M1 which
    are based on the Allwinner A20 32bit-SoC (ARMv7-a / arm-linux-gnueabihf).
    These devices are RaspberryPi-like small devices.
    
    This problem of slow SATA write-speed with these small devices lasts
    for about 7 years now (beginning with the A10 SoC). Many commentators
    throughout the years wrongly assumed the slow write speed was a
    hardware limitation. This patch finally solves the problem, which
    in fact was just a hard-to-find software problem due to lack of
    SATA/AHCI documentation by the SoC-maker Allwinner Technology.
    
    Lists of the affected sunxi and other boards and SoCs with SATA using
    the ahci_sunxi driver:
      $ grep -i -e "^&ahci" arch/arm/boot/dts/sun*dts
      and http://linux-sunxi.org/SATA#Devices_with_SATA_ports
      See also http://linux-sunxi.org/Category:Devices_with_SATA_port
    
    Tested-by: Chen-Yu Tsai <wens@csie.org>
    Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
    Reviewed-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Uenal Mutlu <um@mutluit.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Uenal Mutlu authored and axboe committed Jul 5, 2019
  5. fs: VALIDATE_FS_PARSER should default to n

    CONFIG_VALIDATE_FS_PARSER is a debugging tool to check that the parser
    tables are vaguely sane.  It was set to default to 'Y' for the moment to
    catch errors in upcoming fs conversion development.
    
    Make sure it is not enabled by default in the final release of v5.1.
    
    Fixes: 31d921c ("vfs: Add configuration parser helpers")
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    geertu authored and Al Viro committed Jul 5, 2019
  6. KVM: arm64/sve: Fix vq_present() macro to yield a bool

    The original implementation of vq_present() relied on aggressive
    inlining in order for the compiler to know that the code is
    correct, due to some const-casting issues.  This was causing sparse
    and clang to complain, while GCC compiled cleanly.
    
    Commit 0c529ff addressed this problem, but since vq_present()
    is no longer a function, there is now no implicit casting of the
    returned value to the return type (bool).
    
    In set_sve_vls(), this uncast bit value is compared against a bool,
    and so may spuriously compare as unequal when both are nonzero.  As
    a result, KVM may reject valid SVE vector length configurations as
    invalid, and vice versa.
    
    Fix it by forcing the returned value to a bool.
    
    Signed-off-by: Zhang Lei <zhang.lei@jp.fujitsu.com>
    Fixes: 0c529ff ("KVM: arm64: Implement vq_present() as a macro")
    Signed-off-by: Dave Martin <Dave.Martin@arm.com> [commit message rewrite]
    Cc: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    fj-zhang-lei authored and bonzini committed Jul 5, 2019
  7. dmaengine: qcom: bam_dma: Fix completed descriptors count

    One space is left unused in circular FIFO to differentiate
    'full' and 'empty' cases. So take that in to account while
    counting for the descriptors completed.
    
    Fixes the issue reported here,
    	https://lkml.org/lkml/2019/6/18/669
    
    Cc: stable@vger.kernel.org
    Reported-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Signed-off-by: Sricharan R <sricharan@codeaurora.org>
    Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Sricharan R authored and vinodkoul committed Jul 5, 2019
  8. dmaengine: imx-sdma: remove BD_INTR for channel0

    It is possible for an irq triggered by channel0 to be received later
    after clks are disabled once firmware loaded during sdma probe. If
    that happens then clearing them by writing to SDMA_H_INTR won't work
    and the kernel will hang processing infinite interrupts. Actually,
    don't need interrupt triggered on channel0 since it's pollling
    SDMA_H_STATSTOP to know channel0 done rather than interrupt in
    current code, just clear BD_INTR to disable channel0 interrupt to
    avoid the above case.
    This issue was brought by commit 1d069bf ("dmaengine: imx-sdma:
    ack channel 0 IRQ in the interrupt handler") which didn't take care
    the above case.
    
    Fixes: 1d069bf ("dmaengine: imx-sdma: ack channel 0 IRQ in the interrupt handler")
    Cc: stable@vger.kernel.org #5.0+
    Signed-off-by: Robin Gong <yibin.gong@nxp.com>
    Reported-by: Sven Van Asbroeck <thesven73@gmail.com>
    Tested-by: Sven Van Asbroeck <thesven73@gmail.com>
    Reviewed-by: Michael Olbrich <m.olbrich@pengutronix.de>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Robin Gong authored and vinodkoul committed Jul 5, 2019
  9. dmaengine: imx-sdma: fix use-after-free on probe error path

    If probe() fails anywhere beyond the point where
    sdma_get_firmware() is called, then a kernel oops may occur.
    
    Problematic sequence of events:
    1. probe() calls sdma_get_firmware(), which schedules the
       firmware callback to run when firmware becomes available,
       using the sdma instance structure as the context
    2. probe() encounters an error, which deallocates the
       sdma instance structure
    3. firmware becomes available, firmware callback is
       called with deallocated sdma instance structure
    4. use after free - kernel oops !
    
    Solution: only attempt to load firmware when we're certain
    that probe() will succeed. This guarantees that the firmware
    callback's context will remain valid.
    
    Note that the remove() path is unaffected by this issue: the
    firmware loader will increment the driver module's use count,
    ensuring that the module cannot be unloaded while the
    firmware callback is pending or running.
    
    Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com>
    Reviewed-by: Robin Gong <yibin.gong@nxp.com>
    [vkoul: fixed braces for if condition]
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Sven Van Asbroeck authored and vinodkoul committed Jul 5, 2019
  10. dmaengine: jz4780: Fix an endian bug in IRQ handler

    The "pending" variable was a u32 but we cast it to an unsigned long
    pointer when we do the for_each_set_bit() loop.  The problem is that on
    big endian 64bit systems that results in an out of bounds read.
    
    Fixes: 4e4106f ("dmaengine: jz4780: Fix transfers being ACKed too soon")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    error27 authored and vinodkoul committed Jul 5, 2019
  11. Merge tag 'drm-fixes-2019-07-05-1' of git://anongit.freedesktop.org/d…

    …rm/drm
    
    Pull drm fixes from Dave Airlie:
     "I skipped last week because there wasn't much worth doing, this week
      got a few more fixes in.
    
      amdgpu:
       - default register value change
       - runpm regression fix
       - fan control fix
    
      i915:
       - fix Ironlake regression
    
      panfrost:
       - fix a double free
    
      virtio:
       - fix a locking bug
    
      imx:
       - crtc disable fixes"
    
    * tag 'drm-fixes-2019-07-05-1' of git://anongit.freedesktop.org/drm/drm:
      drm/imx: only send event on crtc disable if kept disabled
      drm/imx: notify drm core before sending event during crtc disable
      drm/i915/ringbuffer: EMIT_INVALIDATE *before* switch context
      drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE
      drm/amdgpu: Don't skip display settings in hwmgr_resume()
      drm/amd/powerplay: use hardware fan control if no powerplay fan table
      drm/panfrost: Fix a double-free error
      drm/etnaviv: add missing failure path to destroy suballoc
      drm/virtio: move drm_connector_update_edid_property() call
    torvalds committed Jul 5, 2019
  12. Merge tag 'imx-drm-fixes-2019-07-04' of git://git.pengutronix.de/git/…

    …pza/linux into drm-fixes
    
    drm/imx: fix stale vblank timestamp after a modeset
    
    This series fixes stale vblank timestamps in the first event sent after
    a crtc was disabled. The core now is notified via drm_crtc_vblank_off
    before sending the last pending event in atomic_disable. If the crtc is
    reenabled right away during to a modeset, the event is not sent at all,
    as the next vblank will take care of it.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    
    From: Philipp Zabel <p.zabel@pengutronix.de>
    Link: https://patchwork.freedesktop.org/patch/msgid/1562237119.6641.16.camel@pengutronix.de
    airlied committed Jul 5, 2019
  13. Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/herbert/crypto-2.6
    
    Pull crypto fixes from Herbert Xu:
     "This fixes two memory leaks and a list corruption bug"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: user - prevent operating on larval algorithms
      crypto: cryptd - Fix skcipher instance memory leak
      lib/mpi: Fix karactx leak in mpi_powm
    torvalds committed Jul 5, 2019
  14. Merge branch 'akpm' (patches from Andrew)

    Merge more fixes from Andrew Morton:
     "5 fixes"
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
      swap_readpage(): avoid blk_wake_io_task() if !synchronous
      devres: allow const resource arguments
      mm/vmscan.c: prevent useless kswapd loops
      fs/userfaultfd.c: disable irqs for fault_pending and event locks
      mm/page_alloc.c: fix regression with deferred struct page init
    torvalds committed Jul 5, 2019
  15. Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/soc/soc
    
    Pull ARM SoC fixes from Olof Johansson:
     "Likely our final small batch of fixes for 5.2:
    
       - Some fixes for USB on davinci, regressions were due to the recent
         conversion of the OCHI driver to use GPIO regulators
    
       - A fixup of kconfig dependencies for a TI irq controller
    
       - A switch of armada-38x to avoid dropped characters on uart, caused
         by switch of base inherited platform description earlier this year"
    
    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
      ARM: davinci: da830-evm: fix GPIO lookup for OHCI
      ARM: davinci: omapl138-hawk: add missing regulator constraints for OHCI
      ARM: davinci: da830-evm: add missing regulator constraints for OHCI
      soc: ti: fix irq-ti-sci link error
      ARM: dts: armada-xp-98dx3236: Switch to armada-38x-uart serial node
    torvalds committed Jul 5, 2019
  16. Merge tag 'dax-fix-5.2-rc8' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/nvdimm/nvdimm
    
    Pull dax fix from Dan Williams:
     "A single dax fix that has been soaking awaiting other fixes under
      discussion to join it. As it is getting late in the cycle lets proceed
      with this fix and save follow-on changes for post-v5.3-rc1.
    
       - Fix xarray entry association for mixed mappings"
    
    * tag 'dax-fix-5.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
      dax: Fix xarray entry association for mixed mappings
    torvalds committed Jul 5, 2019
  17. Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git…

    …/viro/vfs
    
    Pull do_move_mount() fix from Al Viro:
     "Regression fix"
    
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
      vfs: move_mount: reject moving kernel internal mounts
    torvalds committed Jul 5, 2019
  18. swap_readpage(): avoid blk_wake_io_task() if !synchronous

    swap_readpage() sets waiter = bio->bi_private even if synchronous = F,
    this means that the caller can get the spurious wakeup after return.
    
    This can be fatal if blk_wake_io_task() does
    set_current_state(TASK_RUNNING) after the caller does
    set_special_state(), in the worst case the kernel can crash in
    do_task_dead().
    
    Link: http://lkml.kernel.org/r/20190704160301.GA5956@redhat.com
    Fixes: 0619317 ("block: add polled wakeup task helper")
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Reported-by: Qian Cai <cai@lca.pw>
    Acked-by: Hugh Dickins <hughd@google.com>
    Reviewed-by: Jens Axboe <axboe@kernel.dk>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    utrace authored and torvalds committed Jul 5, 2019
Older