1. 20 7月, 2012 38 次提交
  2. 19 7月, 2012 2 次提交
    • L
      Merge tag 'md-3.5-fixes' of git://neil.brown.name/md · 3e4b9459
      Linus Torvalds 提交于
      Pull three md bugfixes from NeilBrown:
       "One of the bugs was introduced in 3.5-rc1.  Others have been there for
        longer."
      
      * tag 'md-3.5-fixes' of git://neil.brown.name/md:
        md/raid1: close some possible races on write errors during resync
        md: avoid crash when stopping md array races with closing other open fds.
        md: fix bug in handling of new_data_offset
      3e4b9459
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 309d4b00
      Linus Torvalds 提交于
      Pull networking changes from David Miller:
       "Ok, we should be good to go now"
      
      1) We have to statically initialize the init_net device list head rather
         than do so in an initcall, otherwise netprio_cgroup crashes if it's
         built statically rather than modular (Mark D.  Rustad)
      
      2) Fix SKB null oopser in CIPSO ipv4 option processing (Paul Moore)
      
      3) Qlogic maintainers update (Anirban Chakraborty)
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net: Statically initialize init_net.dev_base_head
        MAINTAINERS: Changes in qlcnic and qlge maintainers list
        cipso: don't follow a NULL pointer when setsockopt() is called
      309d4b00