git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5b86d4f 4776cab)

author	Al Viro <viro@zeniv.linux.org.uk>
	Sat, 2 Jun 2018 22:08:11 +0000 (18:08 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Sat, 2 Jun 2018 22:09:27 +0000 (18:09 -0400)
commit	de52cf922a4a17d0a4cd34d697db62a01c1bd092
tree	1c12675d523eaa34e01499ae2a70dc6983a1918b	tree \| snapshot
parent	5b86d4ff5dce3271dff54119e06174dc22422903	commit \| diff
parent	4776cab43fd3111618112737a257dc3ef368eddd	commit \| diff

Merge tag 'afs-fixes-20180514' into afs-proc

backmerge AFS fixes that went into mainline and deal with
the conflict in fs/afs/fsclient.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/afs/cmservice.c	diff1 \|	diff2 \|	blob \| history
fs/afs/fsclient.c	diff1 \|	diff2 \|	blob \| history
fs/afs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/afs/rxrpc.c	diff1 \|	diff2 \|	blob \| history
fs/afs/super.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree