1. 07 11月, 2011 8 次提交
  2. 04 11月, 2011 8 次提交
  3. 02 11月, 2011 22 次提交
  4. 01 11月, 2011 2 次提交
    • L
      Merge branch 'akpm' (Andrew's incoming) · 094803e0
      Linus Torvalds 提交于
      Quoth Andrew:
      
       - Most of MM.  Still waiting for the poweroc guys to get off their
         butts and review some threaded hugepages patches.
      
       - alpha
      
       - vfs bits
      
       - drivers/misc
      
       - a few core kerenl tweaks
      
       - printk() features
      
       - MAINTAINERS updates
      
       - backlight merge
      
       - leds merge
      
       - various lib/ updates
      
       - checkpatch updates
      
      * akpm: (127 commits)
        epoll: fix spurious lockdep warnings
        checkpatch: add a --strict check for utf-8 in commit logs
        kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
        llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
        wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
        fat: follow rename pack_hex_byte() to hex_byte_pack()
        security: follow rename pack_hex_byte() to hex_byte_pack()
        kgdb: follow rename pack_hex_byte() to hex_byte_pack()
        lib: rename pack_hex_byte() to hex_byte_pack()
        lib/string.c: fix strim() semantics for strings that have only blanks
        lib/idr.c: fix comment for ida_get_new_above()
        lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
        lib/bitmap.c: quiet sparse noise about address space
        lib/spinlock_debug.c: print owner on spinlock lockup
        lib/kstrtox: common code between kstrto*() and simple_strto*() functions
        drivers/leds/leds-lp5521.c: check if reset is successful
        leds: turn the blink_timer off before starting to blink
        leds: save the delay values after a successful call to blink_set()
        drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
        drivers/leds/leds-lm3530.c: add __devexit_p where needed
        ...
      094803e0
    • N
      epoll: fix spurious lockdep warnings · d8805e63
      Nelson Elhage 提交于
      epoll can acquire recursively acquire ep->mtx on multiple "struct
      eventpoll"s at once in the case where one epoll fd is monitoring another
      epoll fd.  This is perfectly OK, since we're careful about the lock
      ordering, but it causes spurious lockdep warnings.  Annotate the recursion
      using mutex_lock_nested, and add a comment explaining the nesting rules
      for good measure.
      
      Recent versions of systemd are triggering this, and it can also be
      demonstrated with the following trivial test program:
      
      --------------------8<--------------------
      
      int main(void) {
         int e1, e2;
         struct epoll_event evt = {
             .events = EPOLLIN
         };
      
         e1 = epoll_create1(0);
         e2 = epoll_create1(0);
         epoll_ctl(e1, EPOLL_CTL_ADD, e2, &evt);
         return 0;
      }
      --------------------8<--------------------
      Reported-by: NPaul Bolle <pebolle@tiscali.nl>
      Tested-by: NPaul Bolle <pebolle@tiscali.nl>
      Signed-off-by: NNelson Elhage <nelhage@nelhage.com>
      Acked-by: NJason Baron <jbaron@redhat.com>
      Cc: Dave Jones <davej@redhat.com>
      Cc: Davide Libenzi <davidel@xmailserver.org>
      Cc: <stable@kernel.org>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d8805e63