commit | f065890a7749a3728ad678aaa8a41f56306fb04b | [log] [tgz] |
---|---|---|
author | Alexandre Courbot <acourbot@google.com> | Thu Nov 07 08:32:26 2024 |
committer | Alexandre Courbot <acourbot@google.com> | Fri Nov 15 07:44:51 2024 |
tree | 90e3d0c568d65ee6bed470506d79026c835d4315 | |
parent | 8f460e5afc927d52336f4ee079189f0456a6367a [diff] |
Add conflict resolution for drivers for v6.12-rc5 Change-Id: I6c41caa7c80a28d0e5f0361633e0626c55e6f44f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel-rebase-patches/+/6002135 Reviewed-by: Mateusz UrbaĆczyk <urbanczyk@google.com> Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org> Tested-by: Alexandre Courbot <acourbot@chromium.org> Commit-Queue: Alexandre Courbot <acourbot@chromium.org>