Google Git
Sign in
android / kernel / common / dcae9fa1319b8192dc4574adad998dacc93bed0a
commitdcae9fa1319b8192dc4574adad998dacc93bed0a[log] [tgz]
authorSumit Semwal <sumit.semwal@linaro.org>Wed Sep 05 20:48:15 2018 +0530
committerGreg Kroah-Hartman <gregkh@google.com>Wed Sep 05 19:50:57 2018 +0200
tree76b523b948aced79294e8b8056330d165d9580cd
parenta925dfbdda739ed190fb4c4117960655a510b893 [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>
1 file changed
tree: 76b523b948aced79294e8b8056330d165d9580cd
  1. arch/
  2. block/
  3. certs/
  4. crypto/
  5. Documentation/
  6. drivers/
  7. firmware/
  8. fs/
  9. include/
  10. init/
  11. ipc/
  12. kernel/
  13. lib/
  14. mm/
  15. net/
  16. samples/
  17. scripts/
  18. security/
  19. sound/
  20. tools/
  21. usr/
  22. virt/
  23. .cocciconfig
  24. .get_maintainer.ignore
  25. .gitattributes
  26. .gitignore
  27. .mailmap
  28. build.config.cuttlefish.x86_64
  29. build.config.goldfish.arm
  30. build.config.goldfish.arm64
  31. build.config.goldfish.mips
  32. build.config.goldfish.mips64
  33. build.config.goldfish.x86
  34. build.config.goldfish.x86_64
  35. COPYING
  36. CREDITS
  37. Kbuild
  38. Kconfig
  39. MAINTAINERS
  40. Makefile
  41. README
  42. REPORTING-BUGS
  43. verity_dev_keys.x509