1. 12 Dec, 2016 6 commits
    • Vinod Koul's avatar
      dmaengine: mic_x100_dma: remove unused ‘data’ · 765d2a65
      Vinod Koul authored
      In mic_dma_init(), variable ‘data’ is initialized but never used, which
      leads to warning with W=1
      
      drivers/dma/mic_x100_dma.c: In function ‘mic_dma_init’:
      drivers/dma/mic_x100_dma.c:557:17: warning: variable ‘data’ set but not used [-Wunused-but-set-variable]
         unsigned long data;
      
      So remove it.
      
      Cc: Sudeep Dutt <sudeep.dutt@intel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      765d2a65
    • Vinod Koul's avatar
      dmaengine: img-mdc: remove unused ‘prev_phys’ · e5a6b3d5
      Vinod Koul authored
      In mdc_prep_dma_memcpy(), mdc_prep_dma_cyclic() and mdc_prep_slave_sg()
      variable ‘prev_phys’ is initialized but never used, which
      leads to warning with W=1
      
      drivers/dma/img-mdc-dma.c: In function ‘mdc_prep_dma_memcpy’:
      drivers/dma/img-mdc-dma.c:295:24: warning: variable ‘prev_phys’ set but not used [-Wunused-but-set-variable]
        dma_addr_t curr_phys, prev_phys;
      
      drivers/dma/img-mdc-dma.c: In function ‘mdc_prep_dma_cyclic’:
      drivers/dma/img-mdc-dma.c:378:24: warning: variable ‘prev_phys’ set but not used [-Wunused-but-set-variable]
        dma_addr_t curr_phys, prev_phys;
      
      drivers/dma/img-mdc-dma.c: In function ‘mdc_prep_slave_sg’:
      drivers/dma/img-mdc-dma.c:461:24: warning: variable ‘prev_phys’ set but not
      used [-Wunused-but-set-variable]
        dma_addr_t curr_phys, prev_phys;
      
      So remove it.
      
      Cc: Damien.Horsley <Damien.Horsley@imgtec.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      e5a6b3d5
    • Vinod Koul's avatar
      dmaengine: usb-dmac: remove unused ‘uchan’ · 7833a31d
      Vinod Koul authored
      In usb_dmac_of_xlate(), variable ‘uchan’ is initialized but never used, which
      leads to warning with W=1
      
      drivers/dma/sh/usb-dmac.c: In function ‘usb_dmac_of_xlate’:
      drivers/dma/sh/usb-dmac.c:655:24: warning: variable ‘uchan’ set but not used [-Wunused-but-set-variable]
        struct usb_dmac_chan *uchan;
      
      So remove it.
      
      Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      7833a31d
    • Vinod Koul's avatar
      dmaengine: ioat: remove unused ‘res’ · eef2c22c
      Vinod Koul authored
      In __cleanup(), variable ‘res’ is initialized but never used, which
      leads to warning with W=1
      
      drivers/dma/ioat/dma.c: In function ‘__cleanup’:
      drivers/dma/ioat/dma.c:614:28: warning: variable ‘res’ set but not used [-Wunused-but-set-variable]
          struct dmaengine_result res;
      
      So remove it.
      
      Cc: Dave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      eef2c22c
    • Vinod Koul's avatar
      dmaengine: ioat: remove unused ‘ioat_dma’ · 4cc80441
      Vinod Koul authored
      In ioat_tx_submit_unlock(), variable ‘ioat_dma’ is initialized but never
      used, which leads to warning with W=1
      
      drivers/dma/ioat/dma.c: In function ‘ioat_alloc_ring_ent’:
      drivers/dma/ioat/dma.c:341:25: warning: variable ‘ioat_dma’ set but not used [-Wunused-but-set-variable]
        struct ioatdma_device *ioat_dma;
      
      So remove it.
      
      Cc: Dave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      4cc80441
    • Vinod Koul's avatar
      dmaengine: ioat: remove unused ‘is_raid_device’ · 56c492f3
      Vinod Koul authored
      In ioat3_dma_probe(), variable ‘is_raid_device’ is initialized but never
      used, which leads to warning with W=1
      
      drivers/dma/ioat/init.c: In function ‘ioat3_dma_probe’:
      drivers/dma/ioat/init.c:1084:7: warning: variable ‘is_raid_device’ set
      but not used [-Wunused-but-set-variable]
        bool is_raid_device = false;
      
      So remove it.
      
      Cc: Dave Jiang <dave.jiang@intel.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      56c492f3
  2. 08 Dec, 2016 3 commits
    • Vladimir Murzin's avatar
      dmaengine: pl330: do not generate unaligned access · d07c9e1e
      Vladimir Murzin authored
      When PL330 is used with !MMU the following fault is seen:
      
      Unhandled fault: alignment exception (0x801) at 0x8f26a002
      Internal error: : 801 [#1] ARM
      Modules linked in:
      CPU: 0 PID: 640 Comm: dma0chan0-copy0 Not tainted 4.8.0-6a82063-clean+ #1600
      Hardware name: ARM-Versatile Express
      task: 8f1baa80 task.stack: 8e6fe000
      PC is at _setup_req+0x4c/0x350
      LR is at 0x8f2cbc00
      pc : [<801ea538>]    lr : [<8f2cbc00>]    psr: 60000093
      sp : 8e6ffdc0  ip : 00000000  fp : 00000000
      r10: 00000000  r9 : 8f2cba10  r8 : 8f2cbc00
      r7 : 80000013  r6 : 8f21a050  r5 : 8f21a000  r4 : 8f2ac800
      r3 : 8e6ffe18  r2 : 00944251  r1 : ffffffbc  r0 : 8f26a000
      Flags: nZCv  IRQs off  FIQs on  Mode SVC_32  ISA ARM  Segment none
      Control: 00c5387c
      Process dma0chan0-copy0 (pid: 640, stack limit = 0x8e6fe210)
      Stack: (0x8e6ffdc0 to 0x8e700000)
      fdc0: 00000001 60000093 00000000 8f2cba10 8f26a000 00000004 8f0ae000 8f2cbc00
      fde0: 8f0ae000 8f2ac800 8f21a000 8f21a050 80000013 8f2cbc00 8f2cba10 00000000
      fe00: 60000093 801ebca0 8e6ffe18 000013ff 40000093 00000000 00944251 8f2ac800
      fe20: a0000013 8f2b1320 00001986 00000000 00000001 000013ff 8f1e4f00 8f2cba10
      fe40: 8e6fff6c 801e9044 00000003 00000000 fef98c80 002faf07 8e6ffe7c 00000000
      fe60: 00000002 00000000 00001986 8f1f158d 8f1e4f00 80568de4 00000002 00000000
      fe80: 00001986 8f1f53ff 40000001 80580500 8f1f158d 8001e00c 00000000 cfdfdfdf
      fea0: fdae2a25 00000001 00000004 8e6fe000 00000008 00000010 00000000 00000005
      fec0: 8f2b1330 8f2b1334 8e6ffe80 8e6ffe8c 00001986 00000000 8f21a014 00000001
      fee0: 8e6ffe60 8e6ffe78 00000002 00000000 000013ff 00000001 80568de4 8f1e8018
      ff00: 0000158d 8055ec30 00000001 803f6b00 00001986 8f2cba10 fdae2a25 00000001
      ff20: 8f1baca8 8e6fff24 8e6fff24 00000000 8e6fff24 ac6f3037 00000000 00000000
      ff40: 00000000 8e6fe000 8f1e4f40 00000000 8f1e4f40 8f1e4f00 801e84ec 00000000
      ff60: 00000000 00000000 00000000 80031714 dfdfdfcf 00000000 dfdfdfcf 8f1e4f00
      ff80: 00000000 8e6fff84 8e6fff84 00000000 8e6fff90 8e6fff90 8e6fffac 8f1e4f40
      ffa0: 80031640 00000000 00000000 8000f548 00000000 00000000 00000000 00000000
      ffc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
      ffe0: 00000000 00000000 00000000 00000000 00000013 00000000 dfdfdfcf cfdfdfdf
      [<801ea538>] (_setup_req) from [<801ebca0>] (pl330_tasklet+0x41c/0x490)
      [<801ebca0>] (pl330_tasklet) from [<801e9044>] (dmatest_func+0xb58/0x149c)
      [<801e9044>] (dmatest_func) from [<80031714>] (kthread+0xd4/0xec)
      [<80031714>] (kthread) from [<8000f548>] (ret_from_fork+0x14/0x2c)
      Code: e3a03001 e3e01043 e5c03001 e59d3048 (e5802002)
      
      This happens because _emit_{ADDH,MOV,GO) accessing to unaligned data
      while writing to buffer. Fix it with writing to buffer byte by byte.
      Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
      Tested-by: default avatarRobin Murphy <robin.murphy@arm.com>
      Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      d07c9e1e
    • Vinod Koul's avatar
      dmaengine: k3dma: move to dma_pool_zalloc · 646b3b56
      Vinod Koul authored
      Replace dma_pool_alloc & memset with dma_pool_zalloc.
      Acked-by: default avatarZhangfei Gao <zhangfei.gao@linaro.org>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      646b3b56
    • Vinod Koul's avatar
      dmaengine: at_hdmac: move to dma_pool_zalloc · 12154c87
      Vinod Koul authored
      Replace dma_pool_alloc & memset with dma_pool_zalloc.
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      12154c87
  3. 06 Dec, 2016 1 commit
  4. 30 Nov, 2016 6 commits
  5. 29 Nov, 2016 1 commit
  6. 25 Nov, 2016 6 commits
  7. 14 Nov, 2016 4 commits
    • Stephen Barber's avatar
      dmaengine: pl330: Handle xferred count if DMAMOV hasn't finished · c44da03d
      Stephen Barber authored
      After executing DMAGO it's possible that a request can come in for the
      current xferred count, but if that happens too soon then DMAMOV SAR/DAR
      may not have yet completed. If that happens, we should explicitly return 0
      since nothing has been transferred yet.
      Signed-off-by: default avatarStephen Barber <smbarber@chromium.org>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      c44da03d
    • Niklas Cassel's avatar
      dmaengine: nbpfaxi: add optional max-burst property for memory reads/writes · 9a1a34f3
      Niklas Cassel authored
      Due to a hardware bug, reading memory (from the Accelerator Coherency Port)
      with a burst size equal to the maximum burst size allowed by the DMA
      hardware's buffer size will cause a hardware hang on the ARTPEC-6 SoC,
      where the only solution is a manual power cycle.
      On ARTPEC-6, this hardware bug does not trigger when writing memory (to the
      Accelerator Coherency Port) with a burst size equal to the maximum burst
      size allowed by the DMA hardware's buffer size.
      
      To avoid this hardware hang, introduce a new optional max-burst property
      for memory reads. For completeness, also introduce a max-burst property for
      memory writes.
      Signed-off-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      9a1a34f3
    • Paul Gortmaker's avatar
      dmaengine: tegra210-adma: convert TEGRA210_ADMA from bool to tristate · 3ed16793
      Paul Gortmaker authored
      This driver currently uses modular infrastructure but is controlled
      by a bool Kconfig.
      
      There is a general consensus from the DMA reviewers and maintainers
      that "if it can be modular, it should be modular" in order to keep
      the bzImage size under control for multi platform kernels.
      
      Build tested only.  Also needed some new pm_clk symbols exported
      before this commit is applied to tree in order to avoid modpost
      errors like:
      
        ERROR: "pm_clk_add_clk" [drivers/dma/tegra210-adma.ko] undefined!
        ERROR: "pm_clk_create" [drivers/dma/tegra210-adma.ko] undefined!
        ERROR: "pm_clk_destroy" [drivers/dma/tegra210-adma.ko] undefined!
        ERROR: "pm_clk_suspend" [drivers/dma/tegra210-adma.ko] undefined!
        ERROR: "pm_clk_resume" [drivers/dma/tegra210-adma.ko] undefined!
      
      These were added as exports in the v4.8-rc1 merge window.
      
      Cc: Laxman Dewangan <ldewangan@nvidia.com>
      Cc: Jon Hunter <jonathanh@nvidia.com>
      Acked-by: default avatarJon Hunter <jonathanh@nvidia.com>
      Cc: Dan Williams <dan.j.williams@intel.com>
      Cc: Vinod Koul <vinod.koul@intel.com>
      Cc: Stephen Warren <swarren@wwwdotorg.org>
      Cc: Thierry Reding <thierry.reding@gmail.com>
      Cc: Alexandre Courbot <gnurou@gmail.com>
      Cc: dmaengine@vger.kernel.org
      Cc: linux-tegra@vger.kernel.org
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      3ed16793
    • Javier Martinez Canillas's avatar
      dmaengine: fsl_raid: Fix module autoload · d0b2a5b8
      Javier Martinez Canillas authored
      If the driver is built as a module, autoload won't work because the module
      alias information is not filled. So user-space can't match the registered
      device with the corresponding module.
      
      Export the module alias information using the MODULE_DEVICE_TABLE() macro.
      
      Before this patch:
      
      $ modinfo drivers/dma/fsl_raid.ko | grep alias
      $
      
      After this patch:
      
      $ modinfo drivers/dma/fsl_raid.ko | grep alias
      alias:          of:N*T*Cfsl,raideng-v1.0C*
      alias:          of:N*T*Cfsl,raideng-v1.0
      Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      d0b2a5b8
  8. 15 Oct, 2016 13 commits
    • Linus Torvalds's avatar
      Linux 4.9-rc1 · 1001354c
      Linus Torvalds authored
      1001354c
    • Linus Torvalds's avatar
      Merge tag 'befs-v4.9-rc1' of git://github.com/luisbg/linux-befs · df34d04a
      Linus Torvalds authored
      Pull befs fixes from Luis de Bethencourt:
       "I recently took maintainership of the befs file system [0]. This is
        the first time I send you a git pull request, so please let me know if
        all the below is OK.
      
        Salah Triki and myself have been cleaning the code and fixing a few
        small bugs.
      
        Sorry I couldn't send this sooner in the merge window, I was waiting
        to have my GPG key signed by kernel members at ELCE in Berlin a few
        days ago."
      
      [0] https://lkml.org/lkml/2016/7/27/502
      
      * tag 'befs-v4.9-rc1' of git://github.com/luisbg/linux-befs: (39 commits)
        befs: befs: fix style issues in datastream.c
        befs: improve documentation in datastream.c
        befs: fix typos in datastream.c
        befs: fix typos in btree.c
        befs: fix style issues in super.c
        befs: fix comment style
        befs: add check for ag_shift in superblock
        befs: dump inode_size superblock information
        befs: remove unnecessary initialization
        befs: fix typo in befs_sb_info
        befs: add flags field to validate superblock state
        befs: fix typo in befs_find_key
        befs: remove unused BEFS_BT_PARMATCH
        fs: befs: remove ret variable
        fs: befs: remove in vain variable assignment
        fs: befs: remove unnecessary *befs_sb variable
        fs: befs: remove useless initialization to zero
        fs: befs: remove in vain variable assignment
        fs: befs: Insert NULL inode to dentry
        fs: befs: Remove useless calls to brelse in befs_find_brun_dblindirect
        ...
      df34d04a
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugins-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 9ffc6694
      Linus Torvalds authored
      Pull gcc plugins update from Kees Cook:
       "This adds a new gcc plugin named "latent_entropy". It is designed to
        extract as much possible uncertainty from a running system at boot
        time as possible, hoping to capitalize on any possible variation in
        CPU operation (due to runtime data differences, hardware differences,
        SMP ordering, thermal timing variation, cache behavior, etc).
      
        At the very least, this plugin is a much more comprehensive example
        for how to manipulate kernel code using the gcc plugin internals"
      
      * tag 'gcc-plugins-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        latent_entropy: Mark functions with __latent_entropy
        gcc-plugins: Add latent_entropy plugin
      9ffc6694
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 133d970e
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "This is the main MIPS pull request for 4.9:
      
        MIPS core arch code:
         - traps: 64bit kernels should read CP0_EBase 64bit
         - traps: Convert ebase to KSEG0
         - c-r4k: Drop bc_wback_inv() from icache flush
         - c-r4k: Split user/kernel flush_icache_range()
         - cacheflush: Use __flush_icache_user_range()
         - uprobes: Flush icache via kernel address
         - KVM: Use __local_flush_icache_user_range()
         - c-r4k: Fix flush_icache_range() for EVA
         - Fix -mabi=64 build of vdso.lds
         - VDSO: Drop duplicated -I*/-E* aflags
         - tracing: move insn_has_delay_slot to a shared header
         - tracing: disable uprobe/kprobe on compact branch instructions
         - ptrace: Fix regs_return_value for kernel context
         - Squash lines for simple wrapper functions
         - Move identification of VP(E) into proc.c from smp-mt.c
         - Add definitions of SYNC barrierstype values
         - traps: Ensure full EBase is written
         - tlb-r4k: If there are wired entries, don't use TLBINVF
         - Sanitise coherentio semantics
         - dma-default: Don't check hw_coherentio if device is non-coherent
         - Support per-device DMA coherence
         - Adjust MIPS64 CAC_BASE to reflect Config.K0
         - Support generating Flattened Image Trees (.itb)
         - generic: Introduce generic DT-based board support
         - generic: Convert SEAD-3 to a generic board
         - Enable hardened usercopy
         - Don't specify STACKPROTECTOR in defconfigs
      
        Octeon:
         - Delete dead code and files across the platform.
         - Change to use all memory into use by default.
         - Rename upper case variables in setup code to lowercase.
         - Delete legacy hack for broken bootloaders.
         - Leave maintaining the link state to the actual ethernet/PHY drivers.
         - Add DTS for D-Link DSR-500N.
         - Fix PCI interrupt routing on D-Link DSR-500N.
      
        Pistachio:
         - Remove ANDROID_TIMED_OUTPUT from defconfig
      
        TX39xx:
         - Move GPIO setup from .mem_setup() to .arch_init()
         - Convert to Common Clock Framework
      
        TX49xx:
         - Move GPIO setup from .mem_setup() to .arch_init()
         - Convert to Common Clock Framework
      
        txx9wdt:
         - Add missing clock (un)prepare calls for CCF
      
        BMIPS:
         - Add PW, GPIO SDHCI and NAND device node names
         - Support APPENDED_DTB
         - Add missing bcm97435svmb to DT_NONE
         - Rename bcm96358nb4ser to bcm6358-neufbox4-sercom
         - Add DT examples for BCM63268, BCM3368 and BCM6362
         - Add support for BCM3368 and BCM6362
      
        PCI
         - Reduce stack frame usage
         - Use struct list_head lists
         - Support for CONFIG_PCI_DOMAINS_GENERIC
         - Make pcibios_set_cache_line_size an initcall
         - Inline pcibios_assign_all_busses
         - Split pci.c into pci.c & pci-legacy.c
         - Introduce CONFIG_PCI_DRIVERS_LEGACY
         - Support generic drivers
      
        CPC
         - Convert bare 'unsigned' to 'unsigned int'
         - Avoid lock when MIPS CM >= 3 is present
      
        GIC:
         - Delete unused file smp-gic.c
      
        mt7620:
         - Delete unnecessary assignment for the field "owner" from PCI
      
        BCM63xx:
         - Let clk_disable() return immediately if clk is NULL
      
        pm-cps:
         - Change FSB workaround to CPU blacklist
         - Update comments on barrier instructions
         - Use MIPS standard lightweight ordering barrier
         - Use MIPS standard completion barrier
         - Remove selection of sync types
         - Add MIPSr6 CPU support
         - Support CM3 changes to Coherence Enable Register
      
        SMP:
         - Wrap call to mips_cpc_lock_other in mips_cm_lock_other
         - Introduce mechanism for freeing and allocating IPIs
      
        cpuidle:
         - cpuidle-cps: Enable use with MIPSr6 CPUs.
      
        SEAD3:
         - Rewrite to use DT and generic kernel feature.
      
        USB:
         - host: ehci-sead3: Remove SEAD-3 EHCI code
      
        FBDEV:
         - cobalt_lcdfb: Drop SEAD3 support
      
        dt-bindings:
         -  Document a binding for simple ASCII LCDs
      
        auxdisplay:
         - img-ascii-lcd: driver for simple ASCII LCD displays
      
        irqchip i8259:
         - i8259: Add domain before mapping parent irq
         - i8259: Allow platforms to override poll function
         - i8259: Remove unused i8259A_irq_pending
      
        Malta:
         - Rewrite to use DT
      
        of/platform:
         - Probe "isa" busses by default
      
        CM:
         - Print CM error reports upon bus errors
      
        Module:
         - Migrate exception table users off module.h and onto extable.h
         - Make various drivers explicitly non-modular:
         - Audit and remove any unnecessary uses of module.h
      
        mailmap:
         - Canonicalize to Qais' current email address.
      
        Documentation:
         - MIPS supports HAVE_REGS_AND_STACK_ACCESS_API
      
        Loongson1C:
         - Add CPU support for Loongson1C
         - Add board support
         - Add defconfig
         - Add RTC support for Loongson1C board
      
        All this except one Documentation fix has sat in linux-next and has
        survived Imagination's automated build test system"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (127 commits)
        Documentation: MIPS supports HAVE_REGS_AND_STACK_ACCESS_API
        MIPS: ptrace: Fix regs_return_value for kernel context
        MIPS: VDSO: Drop duplicated -I*/-E* aflags
        MIPS: Fix -mabi=64 build of vdso.lds
        MIPS: Enable hardened usercopy
        MIPS: generic: Convert SEAD-3 to a generic board
        MIPS: generic: Introduce generic DT-based board support
        MIPS: Support generating Flattened Image Trees (.itb)
        MIPS: Adjust MIPS64 CAC_BASE to reflect Config.K0
        MIPS: Print CM error reports upon bus errors
        MIPS: Support per-device DMA coherence
        MIPS: dma-default: Don't check hw_coherentio if device is non-coherent
        MIPS: Sanitise coherentio semantics
        MIPS: PCI: Support generic drivers
        MIPS: PCI: Introduce CONFIG_PCI_DRIVERS_LEGACY
        MIPS: PCI: Split pci.c into pci.c & pci-legacy.c
        MIPS: PCI: Inline pcibios_assign_all_busses
        MIPS: PCI: Make pcibios_set_cache_line_size an initcall
        MIPS: PCI: Support for CONFIG_PCI_DOMAINS_GENERIC
        MIPS: PCI: Use struct list_head lists
        ...
      133d970e
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 050aaeab
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Just a few trivial small fixes"
      
      * tag 'sound-fix-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: line6: fix a crash in line6_hwdep_write()
        ALSA: seq: fix passing wrong pointer in function call of compatibility layer
        ALSA: hda - Fix a failure of micmute led when having multi adcs
        ALSA: line6: Fix POD X3 Live audio input
      050aaeab
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · b26b5ef5
      Linus Torvalds authored
      Pull more misc uaccess and vfs updates from Al Viro:
       "The rest of the stuff from -next (more uaccess work) + assorted fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        score: traps: Add missing include file to fix build error
        fs/super.c: don't fool lockdep in freeze_super() and thaw_super() paths
        fs/super.c: fix race between freeze_super() and thaw_super()
        overlayfs: Fix setting IOP_XATTR flag
        iov_iter: kernel-doc import_iovec() and rw_copy_check_uvector()
        blackfin: no access_ok() for __copy_{to,from}_user()
        arm64: don't zero in __copy_from_user{,_inatomic}
        arm: don't zero in __copy_from_user_inatomic()/__copy_from_user()
        arc: don't leak bits of kernel stack into coredump
        alpha: get rid of tail-zeroing in __copy_user()
      b26b5ef5
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 87dbe42a
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Including:
      
         - nine bug fixes for stable. Some of these we found at the recent two
           weeks of SMB3 test events/plugfests.
      
         - significant improvements in reconnection (e.g. if server or network
           crashes) especially when mounted with "persistenthandles" or to
           server which advertises Continuous Availability on the share.
      
         - a new mount option "idsfromsid" which improves POSIX compatibility
           in some cases (when winbind not configured e.g.) by better (and
           faster) fetching uid/gid from acl (when "cifsacl" mount option is
           enabled). NB: we are almost complete work on "cifsacl" (querying
           mode/uid/gid from ACL) for SMB3, but SMB3 support for cifsacl is
           not included in this set.
      
         - improved handling for SMB3 "credits" (even if server is buggy)
      
        Still working on two sets of changes:
      
         - cifsacl enablement for SMB3
      
         - cleanup of RFC1001 length calculation (so we can handle encryption
           and multichannel and RDMA)
      
        And a couple of new bugs were reported recently (unrelated to above)
        so will probably have another merge request next week"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: (21 commits)
        CIFS: Retrieve uid and gid from special sid if enabled
        CIFS: Add new mount option to set owner uid and gid from special sids in acl
        CIFS: Reset read oplock to NONE if we have mandatory locks after reopen
        CIFS: Fix persistent handles re-opening on reconnect
        SMB2: Separate RawNTLMSSP authentication from SMB2_sess_setup
        SMB2: Separate Kerberos authentication from SMB2_sess_setup
        Expose cifs module parameters in sysfs
        Cleanup missing frees on some ioctls
        Enable previous version support
        Do not send SMB3 SET_INFO request if nothing is changing
        SMB3: Add mount parameter to allow user to override max credits
        fs/cifs: reopen persistent handles on reconnect
        Clarify locking of cifs file and tcon structures and make more granular
        Fix regression which breaks DFS mounting
        fs/cifs: keep guid when assigning fid to fileinfo
        SMB3: GUIDs should be constructed as random but valid uuids
        Set previous session id correctly on SMB3 reconnect
        cifs: Limit the overall credit acquired
        Display number of credits available
        Add way to query creation time of file via cifs xattr
        ...
      87dbe42a
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · d3304cad
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "Some fixes from Omar and Dave Sterba for our new free space tree.
      
        This isn't heavily used yet, but as we move toward making it the new
        default we wanted to nail down an endian bug"
      
      * 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs: tests: uninline member definitions in free_space_extent
        btrfs: tests: constify free space extent specs
        Btrfs: expand free space tree sanity tests to catch endianness bug
        Btrfs: fix extent buffer bitmap tests on big-endian systems
        Btrfs: catch invalid free space trees
        Btrfs: fix mount -o clear_cache,space_cache=v2
        Btrfs: fix free space tree bitmaps on big-endian systems
      d3304cad
    • Al Viro's avatar
      Merge branch 'work.uaccess' into for-linus · 2692a71b
      Al Viro authored
      2692a71b
    • Guenter Roeck's avatar
      score: traps: Add missing include file to fix build error · 7041c577
      Guenter Roeck authored
      score images fail to build as follows.
      
      arch/score/kernel/traps.c: In function 'show_stack':
      arch/score/kernel/traps.c:55:3: error:
      	implicit declaration of function '__get_user'
      
      __get_user() is declared in asm/uaccess.h, which was previously included
      through asm/module.h.
      
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Fixes: 88dd4a74 ("score: separate extable.h, switch module.h to it")
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      7041c577
    • Oleg Nesterov's avatar
      fs/super.c: don't fool lockdep in freeze_super() and thaw_super() paths · f1a96220
      Oleg Nesterov authored
      sb_wait_write()->percpu_rwsem_release() fools lockdep to avoid the
      false-positives. Now that xfs was fixed by Dave's commit dbad7c99
      ("xfs: stop holding ILOCK over filldir callbacks") we can remove it and
      change freeze_super() and thaw_super() to run with s_writers.rw_sem locks
      held; we add two trivial helpers for that, lockdep_sb_freeze_release()
      and lockdep_sb_freeze_acquire().
      
      xfstests-dev/check `grep -il freeze tests/*/???` does not trigger any
      warning from lockdep.
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      f1a96220
    • Linus Torvalds's avatar
      Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 1a892b48
      Linus Torvalds authored
      Pull overlayfs updates from Miklos Szeredi:
       "This update contains fixes to the "use mounter's permission to access
        underlying layers" area, and miscellaneous other fixes and cleanups.
      
        No new features this time"
      
      * 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: use vfs_get_link()
        vfs: add vfs_get_link() helper
        ovl: use generic_readlink
        ovl: explain error values when removing acl from workdir
        ovl: Fix info leak in ovl_lookup_temp()
        ovl: during copy up, switch to mounter's creds early
        ovl: lookup: do getxattr with mounter's permission
        ovl: copy_up_xattr(): use strnlen
      1a892b48
    • Oleg Nesterov's avatar
      fs/super.c: fix race between freeze_super() and thaw_super() · 89f39af1
      Oleg Nesterov authored
      Change thaw_super() to check frozen != SB_FREEZE_COMPLETE rather than
      frozen == SB_UNFROZEN, otherwise it can race with freeze_super() which
      drops sb->s_umount after SB_FREEZE_WRITE to preserve the lock ordering.
      
      In this case thaw_super() will wrongly call s_op->unfreeze_fs() before
      it was actually frozen, and call sb_freeze_unlock() which leads to the
      unbalanced percpu_up_write(). Unfortunately lockdep can't detect this,
      so this triggers misc BUG_ON()'s in kernel/rcu/sync.c.
      Reported-and-tested-by: default avatarNikolay Borisov <kernel@kyup.com>
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      89f39af1