tree a46ab47b67908bd2a79a5cb20944929b5bc5c228
parent 21a09914420b38facc9d5d41d6790e66c9786c31
parent 20cbd7749445a0429e6baf10fc01cc04088a7832
author Miri Amarilio <mirilio@google.com> 1757699956 +0000
committer Miri Amarilio <mirilio@google.com> 1757994070 -0700

Update kernel to tip of 'cos/main-R109-cos-6.1'

The conflicts were found with `git diff cos/main-R109-cos-6.1`. These are all places where we previously resolved conflicts incorrectly and ended up with the same blocks of code twice, in slightly different locations. I resolved to match the main branch.

BUG=b/444470240
TESTING=presubmits,validation
RELEASE_NOTE=Updated the Linux kernel to v6.1.151.

Change-Id: I1221868c08f1ae85a2e25d3030bbf061ef0e5434
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/111321
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Kevin Berry <kpberry@google.com>