git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	Sumit Semwal <sumit.semwal@linaro.org>
	Wed, 5 Sep 2018 15:18:15 +0000 (20:48 +0530)
committer	Greg Kroah-Hartman <gregkh@google.com>
	Wed, 5 Sep 2018 17:48:49 +0000 (19:48 +0200)
commit	b859aa7d7a0c5eb257b03b08da5a71cec7e61e3c
tree	e7f6a6d9a63a27adbea015185dc56e01a6d2d67e	tree \| snapshot (tar.gz zip)
parent	6fff4be48e261f93ef03a3469c9c5a0e5baaf202	commit \| diff

ANDROID: squashfs: resolve merge conflict with 4.14.68

Commit a3f94cb99a854fa381fe7fadd97c4f61633717a5 upstream changes the way
expected length is calculated for squashfs_readpage. This got merged to
stable 4.14.68.

Android adds .readpages path to make things faster, but the above commit
conflicts with it.

We try to adapt as close to upstream as possible, while not touching the
squashfs_readpages_block() mechanism.

Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>