Skip to content
  1. Nov 29, 2012
  2. Nov 26, 2012
    • Linus Torvalds's avatar
      Linux 3.7-rc7 · 9489e9dc
      Linus Torvalds authored
      v3.7-rc7
      9489e9dc
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 08e627b5
      Linus Torvalds authored
      Pull powerpc EEH bugfixes from Benjamin Herrenschmidt.
      
      Two one-liner fixes for the new EEH code.
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/eeh: Do not invalidate PE properly
        powerpc/pseries: Fix oops with MSIs when missing EEH PEs
      08e627b5
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · c2a65d3d
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Three issues fixed accross the field:
      
         - Some functions that were recently outlined as part of a preemption
           fix were causing problems with function tracing.
         - The recently merged in-kernel MPI library uses very outdated
           headers that contain MIPS-specific code which won't build on with
           gcc 4.4 or newer.
         - The MIPS non-NUMA memory initialization was making only a very
           half-baked attempt at merging adjacent memory ranges.  This kept
           the code simple enough but is now causing issues with kexec."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MPI: Fix compilation on MIPS with GCC 4.4 and newer
        MIPS: Fix crash that occurs when function tracing is enabled
        MIPS: Merge overlapping bootmem ranges
      c2a65d3d
    • Gavin Shan's avatar
      powerpc/eeh: Do not invalidate PE properly · e716e014
      Gavin Shan authored
      
      
      While the EEH does recovery on the specific PE that has PCI errors,
      the PCI devices belonging to the PE will be removed and the PE will
      be marked as invalid since we still need the information stored in
      the PE. We only invalidate the PE when it doesn't have associated
      EEH devices and valid child PEs. However, the code used to check
      that is wrong. The patch fixes that.
      
      Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e716e014
  3. Nov 25, 2012
  4. Nov 24, 2012