diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-02 10:42:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-02 10:42:26 -0700 |
| commit | 0c7fc30f18220c0d1b8fb2636811a0c0d0d65714 (patch) | |
| tree | 0bfdc30ba7b529b3845b63bfb5c12bb9198ebbf0 /drivers/infiniband | |
| parent | bb6bbc7ca2254fd885f5b85f4cc0cda7cf04f8c1 (diff) | |
| parent | 2a0100d7beebd2fb2c436852648f75396253e9f8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
1) Fix section mismatches in some builds, from Paul Gortmaker.
2) Need to count huge zero page mappings when doing TSB sizing, from
Mike Kravetz.
3) Fix handing of cpu_possible_mask when nr_cpus module option is
specified, from Atish Patra.
4) Don't allocate irq stacks until nr_irqs has been processed, also
from Atish Patra.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix non-SMP build.
sparc64: Fix irq stack bootmem allocation.
sparc64: Fix cpu_possible_mask if nr_cpus is set
sparc64 mm: Fix more TSB sizing issues
sparc64: fix section mismatch in find_numa_latencies_for_group
Diffstat (limited to 'drivers/infiniband')