diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2015-06-01 20:44:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2015-06-01 20:44:51 -0700 |
| commit | 2459c6099b14b363e7212819a2d823cc167a1cd5 (patch) | |
| tree | bdc98ae4d5a1fd7a25c32a14aef138aca3ed1317 /net/ipv4/tcp_dctcp.c | |
| parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| parent | sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE (diff) | |
| download | linux-2459c6099b14b363e7212819a2d823cc167a1cd5.tar.gz linux-2459c6099b14b363e7212819a2d823cc167a1cd5.tar.bz2 linux-2459c6099b14b363e7212819a2d823cc167a1cd5.zip | |
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/ipv4/tcp_dctcp.c')
0 files changed, 0 insertions, 0 deletions