git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bb2a8b0 32c1431)

author	J. Bruce Fields <bfields@redhat.com>
	Wed, 28 Jun 2017 17:34:15 +0000 (13:34 -0400)
committer	J. Bruce Fields <bfields@redhat.com>
	Wed, 28 Jun 2017 17:34:15 +0000 (13:34 -0400)
commit	9a1d168e1bc2893120bb7c0d9932dd22f97d0b55
tree	f7d419f1601419aa0aebda102a6b14bdf7653443	tree \| snapshot (tar.gz zip)
parent	bb2a8b0cd116219777b99cb71fe9e24b31d3f521	commit \| diff
parent	32c1431eea4881a6b17bd7c639315010aeefa452	commit \| diff

Merge tag 'v4.12-rc5' into nfsd tree

Update to get f0c3192ceee3 "virtio_net: lower limit on buffer size".
That bug was interfering with my nfsd testing.

fs/nfs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs3xdr.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4proc.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfsxdr.c	diff1 \|	diff2 \|	blob \| history
include/linux/sunrpc/svc.h	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi