1. 17 4月, 2015 38 次提交
  2. 16 4月, 2015 2 次提交
    • H
      crypto: fix broken crypto_register_instance() module handling · 34c9a0ff
      Herbert Xu 提交于
      Commit 9c521a20 ("crypto: api - remove instance when test failed")
      tried to grab a module reference count before the module was even set.
      
      Worse, it then goes on to free the module reference count after it is
      set so you quickly end up with a negative module reference count which
      prevents people from using any instances belonging to that module.
      
      This patch moves the module initialisation before the reference
      count.
      Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      34c9a0ff
    • L
      Merge branch 'akpm' (patches from Andrew) · eea3a002
      Linus Torvalds 提交于
      Merge second patchbomb from Andrew Morton:
      
       - the rest of MM
      
       - various misc bits
      
       - add ability to run /sbin/reboot at reboot time
      
       - printk/vsprintf changes
      
       - fiddle with seq_printf() return value
      
      * akpm: (114 commits)
        parisc: remove use of seq_printf return value
        lru_cache: remove use of seq_printf return value
        tracing: remove use of seq_printf return value
        cgroup: remove use of seq_printf return value
        proc: remove use of seq_printf return value
        s390: remove use of seq_printf return value
        cris fasttimer: remove use of seq_printf return value
        cris: remove use of seq_printf return value
        openrisc: remove use of seq_printf return value
        ARM: plat-pxa: remove use of seq_printf return value
        nios2: cpuinfo: remove use of seq_printf return value
        microblaze: mb: remove use of seq_printf return value
        ipc: remove use of seq_printf return value
        rtc: remove use of seq_printf return value
        power: wakeup: remove use of seq_printf return value
        x86: mtrr: if: remove use of seq_printf return value
        linux/bitmap.h: improve BITMAP_{LAST,FIRST}_WORD_MASK
        MAINTAINERS: CREDITS: remove Stefano Brivio from B43
        .mailmap: add Ricardo Ribalda
        CREDITS: add Ricardo Ribalda Delgado
        ...
      eea3a002