1. 14 9月, 2013 5 次提交
    • L
      Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux · 3711d86a
      Linus Torvalds 提交于
      Pull writeback fix from Wu Fengguang:
       "A trivial writeback fix"
      
      * tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
        writeback: Do not sort b_io list only because of block device inode
      3711d86a
    • L
      vfs: fix dentry LRU list handling and nr_dentry_unused accounting · 89dc77bc
      Linus Torvalds 提交于
      The LRU list changes interacted badly with our nr_dentry_unused
      accounting, and even worse with the new DCACHE_LRU_LIST bit logic.
      
      This introduces helper functions to make sure everything follows the
      proper dcache d_lru list rules: the dentry cache is complicated by the
      fact that some of the hotpaths don't even want to look at the LRU list
      at all, and the fact that we use the same list entry in the dentry for
      both the LRU list and for our temporary shrinking lists when removing
      things from the LRU.
      
      The helper functions temporarily have some extra sanity checking for the
      flag bits that have to match the current LRU state of the dentry.  We'll
      remove that before the final 3.12 release, but considering how easy it
      is to get wrong, this first cleanup version has some very particular
      sanity checking.
      Acked-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      89dc77bc
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · bdbdfdef
      Linus Torvalds 提交于
      Pull hwmon fixes from Guenter Roeck:
       "Some more low risk cleanup patches:
      
         - Remove unnecessary pci_set_drvdata in k10temp driver from Jingoo Han
         - Fix return values in several drivers from Sachin Kamat
         - Remove redundant break in amc6821 driver from Sachin Kamat"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (k10temp) remove unnecessary pci_set_drvdata()
        hwmon: (tmp421) Fix return value
        hwmon: (amc6821) Remove redundant break
        hwmon: (amc6821) Fix return value
        hwmon: (ibmaem) Fix return value
        hwmon: (emc2103) Fix return value
      bdbdfdef
    • L
      Merge tag 'xtensa-next-20130912' of git://github.com/czankel/xtensa-linux · 67002151
      Linus Torvalds 提交于
      Pull Xtensa updates from Chris Zankel.
      
      * tag 'xtensa-next-20130912' of git://github.com/czankel/xtensa-linux:
        xtensa: Fix broken allmodconfig build
        xtensa: remove CCOUNT_PER_JIFFY
        xtensa: fix !CONFIG_XTENSA_CALIBRATE_CCOUNT build failure
        xtensa: don't use echo -e needlessly
        xtensa: new fast_alloca handler
        xtensa: keep a3 and excsave1 on entry to exception handlers
        xtensa: enable kernel preemption
        xtensa: check thread flags atomically on return from user exception
      67002151
    • L
      Merge git://git.kvack.org/~bcrl/aio-next · 9bf12df3
      Linus Torvalds 提交于
      Pull aio changes from Ben LaHaise:
       "First off, sorry for this pull request being late in the merge window.
        Al had raised a couple of concerns about 2 items in the series below.
        I addressed the first issue (the race introduced by Gu's use of
        mm_populate()), but he has not provided any further details on how he
        wants to rework the anon_inode.c changes (which were sent out months
        ago but have yet to be commented on).
      
        The bulk of the changes have been sitting in the -next tree for a few
        months, with all the issues raised being addressed"
      
      * git://git.kvack.org/~bcrl/aio-next: (22 commits)
        aio: rcu_read_lock protection for new rcu_dereference calls
        aio: fix race in ring buffer page lookup introduced by page migration support
        aio: fix rcu sparse warnings introduced by ioctx table lookup patch
        aio: remove unnecessary debugging from aio_free_ring()
        aio: table lookup: verify ctx pointer
        staging/lustre: kiocb->ki_left is removed
        aio: fix error handling and rcu usage in "convert the ioctx list to table lookup v3"
        aio: be defensive to ensure request batching is non-zero instead of BUG_ON()
        aio: convert the ioctx list to table lookup v3
        aio: double aio_max_nr in calculations
        aio: Kill ki_dtor
        aio: Kill ki_users
        aio: Kill unneeded kiocb members
        aio: Kill aio_rw_vect_retry()
        aio: Don't use ctx->tail unnecessarily
        aio: io_cancel() no longer returns the io_event
        aio: percpu ioctx refcount
        aio: percpu reqs_available
        aio: reqs_active -> reqs_available
        aio: fix build when migration is disabled
        ...
      9bf12df3
  2. 13 9月, 2013 35 次提交