tree 601cb6173b031b1cc2efc57dc040105cb12d14da
parent c1e26788dd5b337edc9bd34899ad55bd21eed802
author Łukasz Bartosik <ukaszb@google.com> 1649834055 +0200
committer Łukasz Bartosik <ukaszb@google.com> 1649834055 +0200

Add conflict resolution for tpm-virtio branch for v5.18-rc2

Signed-off-by: Łukasz Bartosik <ukaszb@google.com>