Google Git
Sign in
android/kernel/msm/refs/heads/android-msm-coral-4.14-s-beta-2
commit
609f9e512cd4f41eb31b7c3ed78e306b0799fd5b
[log]
author
Lucas Wei <[email protected]>
Wed May 05 10:58:52 2021 +0800
committer
Lucas Wei <[email protected]>
Wed May 05 10:59:29 2021 +0800
tree
5d1d3bd9692ecf5d474e079a74dd80ce77cb0327
parent
c6d7ce07e46857d9a58b31f9ad2265adb74b927c [diff]
parent
307de07be1e524d229edd793bb245cafe7690479 [diff]
Merge branch 'android-msm-floral-4.14-rvc-qpr3' into android-msm-pixel-4.14

 Conflicts:
	fs/incfs/data_mgmt.c
	fs/incfs/format.c
	fs/incfs/main.c
	fs/incfs/vfs.c

Bug: 186384031
Signed-off-by: Lucas Wei <[email protected]>
Change-Id: I34a611c9ea0d581dc5ede2c5f79f96bf01bc1c65
tree: 5d1d3bd9692ecf5d474e079a74dd80ce77cb0327
  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. techpack/
  21. test/
  22. tools/
  23. usr/
  24. virt/
  25. .clang-format
  26. .cocciconfig
  27. .get_maintainer.ignore
  28. .gitattributes
  29. .gitignore
  30. .mailmap
  31. Androidbp
  32. AndroidKernel.mk
  33. build.config
  34. build.config.aarch64
  35. build.config.boundsan
  36. build.config.common
  37. build.config.common.clang
  38. build.config.cuttlefish.aarch64
  39. build.config.cuttlefish.x86_64
  40. build.config.debug_api
  41. build.config.debug_hang
  42. build.config.debug_locking
  43. build.config.debug_memory
  44. build.config.floral
  45. build.config.floral.common
  46. build.config.floral.common.clang
  47. build.config.floral_debug_api
  48. build.config.floral_debug_hang
  49. build.config.floral_debug_locking
  50. build.config.floral_debug_memory
  51. build.config.floral_debug_memory_accounting
  52. build.config.floral_kasan
  53. build.config.floral_khwasan
  54. build.config.floral_no-cfi
  55. build.config.floral_performance
  56. build.config.gcc
  57. build.config.goldfish.arm
  58. build.config.goldfish.arm64
  59. build.config.goldfish.mips
  60. build.config.goldfish.mips64
  61. build.config.goldfish.x86
  62. build.config.goldfish.x86_64
  63. build.config.kasan
  64. build.config.khwasan
  65. build.config.no-cfi
  66. build.config.performance
  67. build.config.sunfish
  68. build.config.sunfish.common
  69. build.config.sunfish.common.clang
  70. build.config.sunfish_debug_api
  71. build.config.sunfish_debug_hang
  72. build.config.sunfish_debug_locking
  73. build.config.sunfish_debug_memory
  74. build.config.sunfish_debug_memory_accounting
  75. build.config.sunfish_kasan
  76. build.config.sunfish_khwasan
  77. build.config.sunfish_no-cfi
  78. build.config.sunfish_performance
  79. build_floral.sh
  80. build_sunfish.sh
  81. COPYING
  82. CREDITS
  83. gen_headers_arm.bp
  84. gen_headers_arm64.bp
  85. Kbuild
  86. Kconfig
  87. kernel_headers.py
  88. MAINTAINERS
  89. Makefile
  90. OWNERS
  91. PREUPLOAD.cfg
  92. README
  93. verity_dev_keys.x509