summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-11 16:57:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-11 16:57:32 -0800
commit1545dec46db3858bbce84c2065b579e2925706ab (patch)
tree3b515a27bc0da314d2c79469171d70f9299d0956 /drivers/net/ethernet
parentab2781592a223510da6b19069a2ab8ba0e3ef2f5 (diff)
parent21acdf45f4958135940f0b4767185cf911d4b010 (diff)
downloadlinux-1545dec46db3858bbce84c2065b579e2925706ab.tar.bz2
Merge tag 'ceph-for-4.15-rc8' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov: "Two rbd fixes for 4.12 and 4.2 issues respectively, marked for stable" * tag 'ceph-for-4.15-rc8' of git://github.com/ceph/ceph-client: rbd: set max_segments to USHRT_MAX rbd: reacquire lock should update lock owner client id
Diffstat (limited to 'drivers/net/ethernet')
0 files changed, 0 insertions, 0 deletions