CHROMIUM: Merge tag 'v6.1.178' into chromeos-6.1
Conflicts:
drivers/pci/Makefile
Incoming commit 97649acc2148 conflicts due to downstream
commit 44639acffa01. Apply the incoming and keep the
downstream changes.
fs/efivarfs/super.c
Incoming commit 32343b69bd84 and 115409cbb6a2 conflict
due to chromeos-6.1 picked commit 003ec8028f40 (upstream
5329aa5101f7) which is not in linux-6.1.y. Keep both.
fs/ntfs3/fslog.c
Incoming commit c69b90033329 and 9b3d8cc9d54f conflict
due to it already present downstream (commit
f73729dc5202). Incoming commit 9b3d8cc9d54f fixes the
tailing spaces, so just apply it.
net/bluetooth/hci_event.c
Incoming commit 6a112b664aa2 conflicts due to downstream
commit 3f9ae2a9efab7. The incoming diff can apply
cleanly, so just apply it.
Incoming commit f7e83f2278f06 conflicts due to
downstream commit dfeffbc70db98. The incoming diff can
apply cleanly, so just apply it.
Fixes:
net/bluetooth/mgmt.c
hci_conn_add() -> hci_conn_add_unset() due to incoming
commit f7e83f2278f0.
BUG=b:542900253
TEST=cq
Change-Id: Id0e4ed55e5c103163808af33fe3959f44af0de9c
Disallow-Recycled-Builds: test-failures
Signed-off-by: Tzung-Bi Shih <tzungbi@chromium.org>