1. 20 9月, 2014 2 次提交
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7a5e8786
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "Misc fixes:
      
        EFI fixes, a build fix, a page table dumping (debug) fix and a clang
        build fix"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        efi/arm64: Fix fdt-related memory reservation
        x86/mm: Apply the section attribute to the variable, not its type
        x86/efi: Fixup GOT in all boot code paths
        x86/efi: Only load initrd above 4g on second try
        x86-64, ptdump: Mark espfix area only if existent
        x86, irq: Fix build error caused by 9eabc99a
      7a5e8786
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 9f471129
      Linus Torvalds 提交于
      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. 19 9月, 2014 5 次提交
    • L
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · d9773cea
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'sound-3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 33d31d34
      Linus Torvalds 提交于
      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
    • K
      Fix unbalanced mutex in dma_pool_create(). · 153a9f13
      Krzysztof Hałasa 提交于
      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: NKrzysztof Hałasa <khc@piap.pl>
      Cc: stable@vger.kernel.org  # v3.16
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      153a9f13
    • L
      Merge tag 'regulator-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · bd26a74e
      Linus Torvalds 提交于
      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
    • L
      Merge tag 'spi-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 27180f7d
      Linus Torvalds 提交于
      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 9月, 2014 4 次提交
    • P
      Revert "init: make rootdelay=N consistent with rootwait behaviour" · 8ba4caf1
      Paul Gortmaker 提交于
      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: NPaul Gortmaker <paul.gortmaker@windriver.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8ba4caf1
    • M
      MIPS: SmartMIPS: Disable assembler warnings · dab1b445
      Markos Chandras 提交于
      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: NMarkos Chandras <markos.chandras@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/7356/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      dab1b445
    • M
      Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl',... · 94b0955d
      Mark Brown 提交于
      Merge remote-tracking branches 'spi/fix/davinci', 'spi/fix/dw', 'spi/fix/fsl', 'spi/fix/pl022', 'spi/fix/rockchip' and 'spi/fix/sirf' into spi-linus
      94b0955d
    • G
      spi: davinci: remove empty function davinci_spi_cleanup · 6e7488f8
      Grygorii Strashko 提交于
      Remove empty function davinci_spi_cleanup().
      Signed-off-by: NGrygorii Strashko <grygorii.strashko@ti.com>
      Signed-off-by: NMark Brown <broonie@kernel.org>
      6e7488f8
  4. 16 9月, 2014 15 次提交
  5. 15 9月, 2014 11 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 3630056d
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This fixes the newly added drbg generator so that it actually works on
        32-bit machines.  Previously the code was only tested on 64-bit and on
        32-bit it overflowed and simply doesn't work"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: drbg - remove check for uninitialized DRBG handle
        crypto: drbg - backport "fix maximum value checks on 32 bit systems"
      3630056d
    • S
      [SMB3] Fix oops when creating symlinks on smb3 · da80659d
      Steve French 提交于
      We were not checking for symlink support properly for SMB2/SMB3
      mounts so could oops when mounted with mfsymlinks when try
      to create symlink when mfsymlinks on smb2/smb3 mounts
      Signed-off-by: NSteve French <smfrench@gmail.com>
      Cc: <stable@vger.kernel.org> # 3.14+
      CC: Sachin Prabhu <sprabhu@redhat.com>
      da80659d
    • L
      Linux 3.17-rc5 · 9e82bf01
      Linus Torvalds 提交于
      9e82bf01
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 83373f70
      Linus Torvalds 提交于
      Pull vfs fixes from Al Viro:
       "double iput() on failure exit in lustre, racy removal of spliced
        dentries from ->s_anon in __d_materialise_dentry() plus a bunch of
        assorted RCU pathwalk fixes"
      
      The RCU pathwalk fixes end up fixing a couple of cases where we
      incorrectly dropped out of RCU walking, due to incorrect initialization
      and testing of the sequence locks in some corner cases.  Since dropping
      out of RCU walk mode forces the slow locked accesses, those corner cases
      slowed down quite dramatically.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        be careful with nd->inode in path_init() and follow_dotdot_rcu()
        don't bugger nd->seq on set_root_rcu() from follow_dotdot_rcu()
        fix bogus read_seqretry() checks introduced in b37199e6
        move the call of __d_drop(anon) into __d_materialise_unique(dentry, anon)
        [fix] lustre: d_make_root() does iput() on dentry allocation failure
      83373f70
    • L
      vfs: avoid non-forwarding large load after small store in path lookup · 9226b5b4
      Linus Torvalds 提交于
      The performance regression that Josef Bacik reported in the pathname
      lookup (see commit 99d263d4 "vfs: fix bad hashing of dentries") made
      me look at performance stability of the dcache code, just to verify that
      the problem was actually fixed.  That turned up a few other problems in
      this area.
      
      There are a few cases where we exit RCU lookup mode and go to the slow
      serializing case when we shouldn't, Al has fixed those and they'll come
      in with the next VFS pull.
      
      But my performance verification also shows that link_path_walk() turns
      out to have a very unfortunate 32-bit store of the length and hash of
      the name we look up, followed by a 64-bit read of the combined hash_len
      field.  That screws up the processor store to load forwarding, causing
      an unnecessary hickup in this critical routine.
      
      It's caused by the ugly calling convention for the "hash_name()"
      function, and easily fixed by just making hash_name() fill in the whole
      'struct qstr' rather than passing it a pointer to just the hash value.
      
      With that, the profile for this function looks much smoother.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9226b5b4
    • S
      [CIFS] Fix setting time before epoch (negative time values) · 2ae83bf9
      Steve French 提交于
      xfstest generic/258 sets the time on a file to a negative value
      (before 1970) which fails since do_div can not handle negative
      numbers.  In addition 'normal' division of 64 bit values does
      not build on 32 bit arch so have to workaround this by special
      casing negative values in cifs_NTtimeToUnix
      
      Samba server also has a bug with this (see samba bugzilla 7771)
      but it works to Windows server.
      Signed-off-by: NSteve French <smfrench@gmail.com>
      2ae83bf9
    • L
      Merge branch 'parisc-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 5910cfdc
      Linus Torvalds 提交于
      Pull parisc updates from Helge Deller:
       "The most important patch is a new Light Weigth Syscall (LWS) for 8,
        16, 32 and 64 bit atomic CAS operations which is required in order to
        be able to implement the atomic gcc builtins on our platform.
      
        Other than that, we wire up the seccomp, getrandom and memfd_create
        syscalls, fixes a minor off-by-one bug and a wrong printk string"
      
      * 'parisc-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Implement new LWS CAS supporting 64 bit operations.
        parisc: Wire up seccomp, getrandom and memfd_create syscalls
        parisc: dino: fix %d confusingly prefixed with 0x in format string
        parisc: sys_hpux: NUL terminator is one past the end
      5910cfdc
    • A
      be careful with nd->inode in path_init() and follow_dotdot_rcu() · 4023bfc9
      Al Viro 提交于
      in the former we simply check if dentry is still valid after picking
      its ->d_inode; in the latter we fetch ->d_inode in the same places
      where we fetch dentry and its ->d_seq, under the same checks.
      
      Cc: stable@vger.kernel.org # 2.6.38+
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      4023bfc9
    • A
      don't bugger nd->seq on set_root_rcu() from follow_dotdot_rcu() · 7bd88377
      Al Viro 提交于
      return the value instead, and have path_init() do the assignment.  Broken by
      "vfs: Fix absolute RCU path walk failures due to uninitialized seq number",
      which was Cc-stable with 2.6.38+ as destination.  This one should go where
      it went.
      
      To avoid dummy value returned in case when root is already set (it would do
      no harm, actually, since the only caller that doesn't ignore the return value
      is guaranteed to have nd->root *not* set, but it's more obvious that way),
      lift the check into callers.  And do the same to set_root(), to keep them
      in sync.
      
      Cc: stable@vger.kernel.org # 2.6.38+
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      7bd88377
    • L
      Merge tag 'ntb-3.17' of git://github.com/jonmason/ntb · 02c1be3d
      Linus Torvalds 提交于
      Pull ntb driver bugfixes from Jon Mason:
       "NTB driver fixes for queue spread and buffer alignment.  Also, update
        to MAINTAINERS to reflect new e-mail address"
      
      * tag 'ntb-3.17' of git://github.com/jonmason/ntb:
        ntb: Add alignment check to meet hardware requirement
        MAINTAINERS: update NTB info
        NTB: correct the spread of queues over mw's
      02c1be3d
    • L
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8ac19f0d
      Linus Torvalds 提交于
      Pull ARM irq chip fixes from Thomas Gleixner:
       "Another pile of ARM specific irq chip fixlets:
      
         - off by one bugs in the crossbar driver
         - missing annotations
         - a bunch of "make it compile" updates
      
        I pulled the lot today from Jason, but it has been in -next for at
        least a week"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: gic-v3: Declare rdist as __percpu pointer to __iomem pointer
        irqchip: gic: Make gic_default_routable_irq_domain_ops static
        irqchip: exynos-combiner: Fix compilation error on ARM64
        irqchip: crossbar: Off by one bugs in init
        irqchip: gic-v3: Tag all low level accessors __maybe_unused
        irqchip: gic-v3: Only define gic_peek_irq() when building SMP
      8ac19f0d
  6. 14 9月, 2014 3 次提交