CHROMIUM: Merge tag 'v6.1.149' into chromeos-6.1
Conflicts:
arch/x86/kvm/x86.c
Incoming commits changed code adjacent to downstream paravirt
code.
drivers/gpu/drm/scheduler/sched_entity.c
Incoming commit 54629d284527 changed code adjacent to a call to
drm_sched_wakeup(), but local commit 52091bfeb913 renamed the
function to drm_sched_wakeup_if_can_queue().
kernel/sched/fair.c
Local commit 918f229ba2ff added a new instance of
update_next_balance() immediately after update_newidle_cost().
Incoming commit 51e1b67a5eb6 (upstream 155213a2aed4) changes new
cost given update_newidle_cost(). Keep both changes, and and
preserve the intended operation order from 918f229ba2ff: the
additional update_next_balance() should follow
update_newidle_cost().
net/bluetooth/hci_sync.c
Incoming commit cd55c13bbb3Npid backports upstream commit
5af1f84ed13a ("Bluetooth: hci_sync: Fix UAF on
hci_abort_conn_sync"). Our local tree already contains the
backport as d54cd1a82c4. The diffs of the two backport commits
are identical (by manual inspection). To resolve, discard the
incoming changes from cd55c13bbb3d.
sound/soc/soc-dai.c
Two incoming commits touch the file: bec4296a8523 c9cd20ee7337.
Commit bec4296a8523 causes conflicts because c9cd20ee7337
already exists locally as 85944b8f21f9 (both backport upstream
5c5a7521e936). To resolve, take the incoming version of the
code.
External Dependencies:
This merge contains commits that fix
drivers/media/test-drivers/vivid. The upstream v4l-utils repo
contains a corresponding fix in 1cc84dfb41d8 ("v4l2-compliance: fix
pix_array control test"), backported to chromiumos v4l-utils in the
cq-depend below. Without the v4l-utils fix, this merge regresses
tast.camera.V4L2Compliance on betty-arc-t.
BUG=b:464994767
TEST=cq
Change-Id: Ic9af78da0fe9852a768324328f0e2130285b77d6
CQ-Depend: chromium:7240612
Signed-off-by: Lina Versace <[email protected]>
