diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-14 10:22:45 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-14 10:22:45 -0800 |
commit | 9443c168505d308f5ecd8c0db249f6f62a39c448 (patch) | |
tree | 5bc9ef9e092aaa50509c9b1dda38c5698f535e6b /arch/powerpc/platforms/pseries/dlpar.c | |
parent | Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-linus (diff) | |
download | linux-dev-9443c168505d308f5ecd8c0db249f6f62a39c448.tar.xz linux-dev-9443c168505d308f5ecd8c0db249f6f62a39c448.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull NVMe fix from Jens Axboe:
"Just a single fix for nvme over fabrics that should go into 4.15"
* 'for-linus' of git://git.kernel.dk/linux-block:
nvme-fabrics: initialize default host->id in nvmf_host_default()
Diffstat (limited to 'arch/powerpc/platforms/pseries/dlpar.c')
0 files changed, 0 insertions, 0 deletions