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:49:45 +0000 (19:49 +0200)
commit	d35293b6312f3b92e66016192454d81a2a62d422
tree	7a9868b39fc4e75f5d39d7d0e8952157bf704a18	tree \| snapshot (tar.gz zip)
parent	0abf823a60a2e3b0b657ef3240488ca1d9013e24	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>