diff options
| author | Linus Torvalds <[email protected]> | 2016-03-06 19:31:13 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-03-06 19:31:13 +0000 |
| commit | 21b27a74ec0f4e52e001912c89570a49494705a2 (patch) | |
| tree | c9f1bc13a14ad1bd41739e12b92d9510d5b6e6e5 /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
| parent | Merge tag 'upstream-4.5-rc7' of git://git.infradead.org/linux-ubifs (diff) | |
| parent | ceph: initial CEPH_FEATURE_FS_FILE_LAYOUT_V2 support (diff) | |
| download | kernel-21b27a74ec0f4e52e001912c89570a49494705a2.tar.gz kernel-21b27a74ec0f4e52e001912c89570a49494705a2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph fix from Sage Weil:
"This is a final commit we missed to align the protocol compatibility
with the feature bits.
It decodes a few extra fields in two different messages and reports
EIO when they are used (not yet supported)"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: initial CEPH_FEATURE_FS_FILE_LAYOUT_V2 support
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
0 files changed, 0 insertions, 0 deletions