Git Browser for ODROID
Code Review Sign In
git.odroid.com / yocto / kernel / common_drivers / eafebcfc03a25bf89cba8be242bb946481be843f
commiteafebcfc03a25bf89cba8be242bb946481be843f[log] [tgz]
authorqinglin.li <qinglin.li@amlogic.com>Tue Jun 27 12:48:22 2023 +0800
committerWanwei Jiang <wanwei.jiang@amlogic.com>Thu Jun 29 22:49:57 2023 -0700
tree8fc7585f9dcff9b8fbb58d49836c54123c01498c
parentd6e1df1a154402520a653a0de7739b4851a07185 [diff]
upgrade: kernel upgrade fix conflict [1/1]

PD#SWPL-129165

Problem:
kernel upgrade fix conflict

Solution:
kernel upgrade fix conflict

Verify:
local

Change-Id: I1bdcee4097afc381d67bc6ec1be9ab325c51d1c8
Signed-off-by: qinglin.li <qinglin.li@amlogic.com>
7 files changed
tree: 8fc7585f9dcff9b8fbb58d49836c54123c01498c
  1. android/
  2. arch/
  3. auto_patch/
  4. drivers/
  5. include/
  6. samples/
  7. scripts/
  8. sound/
  9. .gitignore
  10. amlogic.bzl
  11. amlogic_utils.bzl
  12. amlogic_utils.sh
  13. build.config.amlogic
  14. build.config.amlogic.bazel
  15. build.config.amlogic.fragment.bazel
  16. build.config.amlogic32
  17. header_include.mk
  18. mk.sh
  19. modules.bzl
  20. modules_rename.txt