1. 19 Sep, 2014 1 commit
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 9f471129
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "A fair number of build fixes for various configurations.
      
        Fixes to BPF, and the BCM47xx platform code, a preemption fix for the
        Loongson core, a syscall auditing fix, wire up the new getrandom and
        memfd_create.  Several patches for EVA"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (30 commits)
        MIPS: SmartMIPS: Disable assembler warnings
        MIPS: Move CPU topology macros to topology.h
        MIPS: Wire up new syscalls getrandom and memfd_create.
        MIPS: Fix a warning for virt_to_page
        arch/mips/net/bpf_jit.c: fix failure check
        MIPS: COP2: CPP macro safety fixes.
        MIPS: Kconfig: Select SMP symbols for CMP
        MIPS: ZBOOT: add missing <linux/string.h> include
        MIPS: IP28: Fix/clean spaces.h
        MIPS: IP28: Select correct L1_CACHE_SHIFT
        MIPS: BCM63xx: delete double assignment
        MIPS: Spelling s/confugrations/configurations/
        MIPS: OCTEON: make get_system_type() thread-safe
        MIPS: CPS: Initialize EVA before bringing up VPEs from secondary cores
        MIPS: Malta: EVA: Rename 'eva_entry' to 'platform_eva_init'
        MIPS: EVA: Add new EVA header
        MIPS: scall64-o32: Fix indirect syscall detection
        MIPS: syscall: Fix AUDIT value for O32 processes on MIPS64
        MIPS: Loongson: Fix COP2 usage for preemptible kernel
        MIPS: NL: Fix nlm_xlp_defconfig build error
        ...
      9f471129
  2. 18 Sep, 2014 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · d9773cea
      Linus Torvalds authored
      Pull cifs/smb3 fixes from Steve French:
       "Fixes for problems found during testing and debugging at the SMB3
        storage test event (plugfest) this week"
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        Fix mfsymlinks file size check
        Update version number displayed by modinfo for cifs.ko
        cifs: remove dead code
        Revert "cifs: No need to send SIGKILL to demux_thread during umount"
        [SMB3] Fix oops when creating symlinks on smb3
        [CIFS] Fix setting time before epoch (negative time values)
      d9773cea
    • Linus Torvalds's avatar
      Merge tag 'sound-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 33d31d34
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "All small fixes in random various drivers, mostly for ASoC at this
        time, which look reasonable for a high rc number"
      
      * tag 'sound-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ASoC: rockchip-i2s: dt: swap tx and rx channed request number in example
        ASoC: rockchip-i2s: fix registers' property of rockchip i2s controller
        ASoC: rockchip-i2s: fix master mode set bit error
        ASoC: cs4265: Fix register address to set the proper data type.
        ALSA: hda - Fix invalid pin powermap without jack detection
        ASoC: soc-pcm: fix dpcm_path_get error handling
        ASoC: samsung-i2s: Check secondary DAI exists before referencing
        ASoC: Update email id of the author
        ASoC: dwc: Update email id of the author
        ASoC: davinci-mcasp: Correct rx format unit configuration
        ASoC: tlv320aic31xx: Fix 24bit samples with I2S format and 12MHz mclk
      33d31d34
    • Krzysztof Hałasa's avatar
      Fix unbalanced mutex in dma_pool_create(). · 153a9f13
      Krzysztof Hałasa authored
      dma_pool_create() needs to unlock the mutex in error case.  The bug was
      introduced in the 3.16 by commit cc6b664a ("mm/dmapool.c: remove
      redundant NULL check for dev in dma_pool_create()")/
      Signed-off-by: default avatarKrzysztof Hałasa <khc@piap.pl>
      Cc: stable@vger.kernel.org  # v3.16
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      153a9f13
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · bd26a74e
      Linus Torvalds authored
      Pull regulator fix from Mark Brown:
       "Fix some leaked OF node references in regulator drivers that have been
        left over following a fix on a fix to the reference counting"
      
      * tag 'regulator-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: remove unnecessary of_node_get() to parent
      bd26a74e
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 27180f7d
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A few driver specific fixes for v3.17:
      
         - Fix davinci so that GPIO chip selects work with deferred probe of
           GPIOs (which could happen in production depending on kernel config)
           plus one incremental stylistic fix to that.
         - Several fixes for the newly introduced rockchip driver that came up
           in wider testing of the device.
         - A couple of small things in the sirf driver, one bug that would
           stop DMA transfers working and another update to follow the
           documented procedure in the datasheet.
         - Fix some memory leaks with devm_kzalloc() being used outside of the
           device bind path"
      
      * tag 'spi-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: davinci: remove empty function davinci_spi_cleanup
        spi: davinci: request cs_gpio's from probe
        spi/pl022: Fix error message
        spi/rockchip: Mark DMA as optional
        spi/rockchip: Don't warn if SPI is busy but disabled
        spi/rockchip: Fix the wait_for_idle() timeout
        spi: sirf: add fifo reset/start for cmd transfer
        spi: sirf: enable RX_IO_DMA_INT interrupt
        spi: dw: Don't use devm_kzalloc in master->setup callback
        spi: fsl: Don't use devm_kzalloc in master->setup callback
      27180f7d
  3. 17 Sep, 2014 2 commits
    • Paul Gortmaker's avatar
      Revert "init: make rootdelay=N consistent with rootwait behaviour" · 8ba4caf1
      Paul Gortmaker authored
      This reverts commit 4dfe694f.
      
      In that, we did:
      
        Here we move the rootdelay code to be right beside the rootwait code, so
        that their behaviour is consistent.
      
      ...which is fine, but in hindsight, perhaps moving the rootwait to be
      beside the rootdelay would have been better.  We also indicated:
      
        It should be noted that in doing so, the actions based on the
        saved_root_name[0] and initrd_load() were previously put on hold by
        rootdelay=N and now currently will not be delayed.  However, I think
        consistent behaviour is more important than matching historical behaviour
        of delaying the above two operations.
      
      But Pavel reported an instance where an ARM target with root on MMC
      was failing to mount root, and Russell diagnosed it to the fact that
      the call to set ROOT_DEV within the saved_root_name[0] processing
      block mentioned above was no longer being delayed.
      
      Rather than moving both wait clauses to the original position of
      rootdelay and risking unearthing other possible corner case breakage
      at this point in time, we simply revert now and we can revisit
      trying the alternate/earlier location in another development cycle.
      
      Cc: Pavel Machek <pavel@denx.de>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8ba4caf1
    • Markos Chandras's avatar
      MIPS: SmartMIPS: Disable assembler warnings · dab1b445
      Markos Chandras authored
      The kernel code overrides the default ISA as passed by the compiler
      in quite a few places. This has unfortunate side effects when smartmips
      is enabled leading to hundreds of warnings during build such as:
      
      {standard input}: Assembler messages:
      {standard input}:411: Warning: the `smartmips' extension requires MIPS32
      revision 1 or greater
      {standard input}: Assembler messages:
      {standard input}:43: Warning: the 64-bit MIPS architecture does not support the
      `smartmips' extension
      [...]
      
      Until the kernel code is fixed properly (if possible), disable all the
      assembler warning messages to make the build logs readable again.
      This has no runtime side effects but it makes it easier to spot
      more critical warnings and problems during build.
      Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/7356/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      dab1b445
  4. 16 Sep, 2014 10 commits
  5. 15 Sep, 2014 12 commits
  6. 14 Sep, 2014 10 commits