| commit | 6e0e48e10a98d58e45ab8569ef10e02652b962ac | [log] [tgz] |
|---|---|---|
| author | Jędrzej Ciupis <jciupis@google.com> | Thu Nov 21 11:40:15 2024 |
| committer | Mateusz Urbańczyk <urbanczyk@google.com> | Thu Dec 05 09:05:00 2024 |
| tree | 6c68faf70335262d9d9f683b795fb78190a5bf23 | |
| parent | bc79b3703ee2c4852a7d311d096328f1534fbb8b [diff] |
Update conflict resolutions for net for v6.12 Change-Id: I7ee75ddd4ed6734b5f0a8660e456aa7622ba45c0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel-rebase-patches/+/6038040 Reviewed-by: Kornel Dulęba <korneld@google.com> Tested-by: Mateusz Urbańczyk <urbanczyk@google.com>