Merge remote-tracking branch 'stable/linux-5.0.y' into zygo-5.0.x-zb64

author Zygo Blaxell <ce3g8jdj@umail.furryterror.org>

Fri, 31 May 2019 18:25:31 +0000 (14:25 -0400)

committer Zygo Blaxell <ce3g8jdj@umail.furryterror.org>

Fri, 31 May 2019 18:25:31 +0000 (14:25 -0400)
author Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Fri, 31 May 2019 18:25:31 +0000 (14:25 -0400)
committer Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
Fri, 31 May 2019 18:25:31 +0000 (14:25 -0400)
diff --cc Makefile
Simple merge
diff --cc fs/btrfs/extent-tree.c
Simple merge
author	Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
	Fri, 31 May 2019 18:25:31 +0000 (14:25 -0400)
committer	Zygo Blaxell <ce3g8jdj@umail.furryterror.org>
	Fri, 31 May 2019 18:25:31 +0000 (14:25 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/extent-tree.c	patch \|	diff1 \|	diff2 \|	blob \| history