summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-01 20:44:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-01 20:44:51 -0700
commit2459c6099b14b363e7212819a2d823cc167a1cd5 (patch)
treebdc98ae4d5a1fd7a25c32a14aef138aca3ed1317 /net
parentfec345baa52e01e05c8c05c04a358b4105445e23 (diff)
parent494e5b6faeda1d1e830a13e10b3c7bc323f35d97 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull Sparc fixes from David Miller: 1) Setup the core/threads/sockets bitmaps correctly so that 'lscpus' and friends operate properly. Frtom Chris Hyser. 2) The bit that normally means "Cached Virtually" on sun4v systems, actually changes meaning in M7 and later chips. Fix from Khalid Aziz. 3) One some PCI-E systems we need to probe different OF properties to fill in the PCI slot information properly, from Eric Snowberg. 4) Kill an extraneous memset after kzalloc(), from Christophe Jaillet. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE sparc64: pci slots information is not populated in sysfs sparc: kernel: GRPCI2: Remove a useless memset sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions