1. 07 2月, 2014 1 次提交
  2. 06 2月, 2014 8 次提交
    • L
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ef42c58a
      Linus Torvalds 提交于
      Pull irq updates from Thomas Gleixner:
       "This lot provides:
      
         * Bugfixes for armada irq controller
         * Updates to renesas irq chip
         * Support for the TI-NSPIRE irq controller
      
        Not strictly a bug fix only pull request, but important updates for
        some of the arm Socs which I completely forgot to send last week.
      
        Seems like my obliviousness is getting worse, I just can't remember
        when it started"
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip: Add support for TI-NSPIRE irqchip
        irqchip: renesas-irqc: Enable mask on suspend
        irqchip: renesas-irqc: Use lazy disable
        irqchip: armada-370-xp: fix MSI race condition
        irqchip: armada-370-xp: fix IPI race condition
      ef42c58a
    • L
      Merge tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 1cd731df
      Linus Torvalds 提交于
      Pull Xen fixes from Konrad Rzeszutek Wilk:
       "Bug-fixes:
         - Revert "xen/grant-table: Avoid m2p_override during mapping" as it
           broke Xen ARM build.
         - Fix CR4 not being set on AP processors in Xen PVH mode"
      
      * tag 'stable/for-linus-3.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/pvh: set CR4 flags for APs
        Revert "xen/grant-table: Avoid m2p_override during mapping"
      1cd731df
    • L
      Merge tag 'please-pull-ia64-syscalls' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 251aa0fd
      Linus Torvalds 提交于
      Pull ia64 update from Tony Luck:
       "Wire up new sched_setattr and sched_getattr syscalls"
      
      * tag 'please-pull-ia64-syscalls' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        [IA64] Wire up new sched_setattr and sched_getattr syscalls
      251aa0fd
    • L
      Merge git://git.infradead.org/users/willy/linux-nvme · 8352650a
      Linus Torvalds 提交于
      Pull NVMe driver update from Matthew Wilcox:
       "Looks like I missed the merge window ...  but these are almost all
        bugfixes anyway (the ones that aren't have been baking for months)"
      
      * git://git.infradead.org/users/willy/linux-nvme:
        NVMe: Namespace use after free on surprise removal
        NVMe: Correct uses of INIT_WORK
        NVMe: Include device and queue numbers in interrupt name
        NVMe: Add a pci_driver shutdown method
        NVMe: Disable admin queue on init failure
        NVMe: Dynamically allocate partition numbers
        NVMe: Async IO queue deletion
        NVMe: Surprise removal handling
        NVMe: Abort timed out commands
        NVMe: Schedule reset for failed controllers
        NVMe: Device resume error handling
        NVMe: Cache dev->pci_dev in a local pointer
        NVMe: Fix lockdep warnings
        NVMe: compat SG_IO ioctl
        NVMe: remove deprecated IRQF_DISABLED
        NVMe: Avoid shift operation when writing cq head doorbell
      8352650a
    • L
      Merge tag 'regulator-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 71c27a8c
      Linus Torvalds 提交于
      Pull regulator fixes from Mark Brown:
       "A couple of driver fixes here but the main thing is a fix to the
        checks for deferred probe non-DT systems with fully specified
        regulators which had been broken by a device tree fix which meant that
        we wouldn't insert optional regulators.
      
        This had slipped through the cracks since very few systems do that in
        the first place and those that do it in mainline don't need optional
        regulators anyway"
      
      * tag 'regulator-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: s2mps11: Fix NULL pointer of_node value when using platform data
        regulator: core: Correct default return value for full constraints
        regulator: ab3100: cast fix
      71c27a8c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 4293242d
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This fixes a number of concurrency issues on s390 where multiple users
        of the same crypto transform may clobber each other's results"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: s390 - fix des and des3_ede ctr concurrency issue
        crypto: s390 - fix des and des3_ede cbc concurrency issue
        crypto: s390 - fix concurrency issue in aes-ctr mode
      4293242d
    • I
      x86: Disable CONFIG_X86_DECODER_SELFTEST in allmod/allyesconfigs · f8f20234
      Ingo Molnar 提交于
      It can take some time to validate the image, make sure
      {allyes|allmod}config doesn't enable it.
      
      I'd say randconfig will cover it often enough, and the failure is also
      borderline build coverage related: you cannot really make the decoder
      test fail via source level changes, only with changes in the build
      environment, so I agree with Andi that we can disable this one too.
      Signed-off-by: NIngo Molnar <mingo@kernel.org>
      Acked-by: Paul Gortmaker paul.gortmaker@windriver.com>
      Suggested-and-acked-by: Andi Kleen andi@firstfloor.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f8f20234
    • L
      execve: use 'struct filename *' for executable name passing · c4ad8f98
      Linus Torvalds 提交于
      This changes 'do_execve()' to get the executable name as a 'struct
      filename', and to free it when it is done.  This is what the normal
      users want, and it simplifies and streamlines their error handling.
      
      The controlled lifetime of the executable name also fixes a
      use-after-free problem with the trace_sched_process_exec tracepoint: the
      lifetime of the passed-in string for kernel users was not at all
      obvious, and the user-mode helper code used UMH_WAIT_EXEC to serialize
      the pathname allocation lifetime with the execve() having finished,
      which in turn meant that the trace point that happened after
      mm_release() of the old process VM ended up using already free'd memory.
      
      To solve the kernel string lifetime issue, this simply introduces
      "getname_kernel()" that works like the normal user-space getname()
      function, except with the source coming from kernel memory.
      
      As Oleg points out, this also means that we could drop the tcomm[] array
      from 'struct linux_binprm', since the pathname lifetime now covers
      setup_new_exec().  That would be a separate cleanup.
      Reported-by: NIgor Zhbanov <i.zhbanov@samsung.com>
      Tested-by: NSteven Rostedt <rostedt@goodmis.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c4ad8f98
  3. 05 2月, 2014 3 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 878a876b
      Linus Torvalds 提交于
      Pull btrfs fixes from Chris Mason:
       "Filipe is fixing compile and boot problems with our crc32c rework, and
        Josef has disabled snapshot aware defrag for now.
      
        As the number of snapshots increases, we're hitting OOM.  For the
        short term we're disabling things until a bigger fix is ready"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: use late_initcall instead of module_init
        Btrfs: use btrfs_crc32c everywhere instead of libcrc32c
        Btrfs: disable snapshot aware defrag for now
      878a876b
    • L
      Merge tag 'nfs-for-3.14-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · d7512f79
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights:
      
         - Fix NFSv3 acl regressions
         - Fix NFSv4 memory corruption due to slot table abuse in
           nfs4_proc_open_confirm
         - nfs4_destroy_session must call rpc_destroy_waitqueue"
      
      * tag 'nfs-for-3.14-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        fs: get_acl() must be allowed to return EOPNOTSUPP
        NFSv3: Fix return value of nfs3_proc_setacls
        NFSv3: Remove unused function nfs3_proc_set_default_acl
        NFSv4.1: nfs4_destroy_session must call rpc_destroy_waitqueue
        NFSv4: Fix memory corruption in nfs4_proc_open_confirm
        nfs: fix setting of ACLs on file creation.
      d7512f79
    • L
      kbuild: don't enable DEBUG_INFO when building for COMPILE_TEST · 12b13835
      Linus Torvalds 提交于
      It really isn't very interesting to have DEBUG_INFO when doing compile
      coverage stuff (you wouldn't want to run the result anyway, that's kind
      of the whole point of COMPILE_TEST), and it currently makes the build
      take longer and use much more disk space for "all{yes,mod}config".
      
      There's somewhat active discussion about this still, and we might end up
      with some new config option for things like this (Andi points out that
      the silly X86_DECODER_SELFTEST option also slows down the normal
      coverage tests hugely), but I'm starting the ball rolling with this
      simple one-liner.
      
      DEBUG_INFO isn't that noticeable if you have tons of memory and a good
      IO subsystem, but it hurts you a lot if you don't - for very little
      upside for the common use.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      12b13835
  4. 04 2月, 2014 10 次提交
  5. 03 2月, 2014 18 次提交