commit 5a28672882c18a85e7fe6d397059d697488a3b34
author Google Cont Rebase <goog-rebase-dev@semihalf.com> Mon Sep 27 11:05:20 2021 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Oct 27 18:36:58 2021 +0000
tree fe34c5f142a8dfe082f98a3955f0a959b10dac99
parent e6489ca86cfbeaf4b69e01d7a0e0fce18fe6bfae

kernel-rebase: remove fixups for chromeos branch

Remove application of the patches as fixups because
these are now cherry-picked during regular triage.

BUG=None
TEST=run continuous kernel rebase

Change-Id: Ia174bd112103685d8d1f12f404b808badfde4a31
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3244288
Tested-by: Łukasz Bartosik <ukaszb@google.com>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Commit-Queue: Łukasz Bartosik <ukaszb@google.com>

contrib/kernel-rebase/rebase_config.py

diff --git a/contrib/kernel-rebase/rebase_config.py b/contrib/kernel-rebase/rebase_config.py
index eb66b1c..5e83bb1 100644
--- a/contrib/kernel-rebase/rebase_config.py
+++ b/contrib/kernel-rebase/rebase_config.py
@@ -43,10 +43,7 @@
 ]
 topic_fixups['block-fs'] = [
     'add ChromeOS specific platform functions',
-    'Add message definitions for CHROMEOS_TMPFILE',
     'bring over dm-verity-chromeos.c',
-    'Revert "ecryptfs_lookup(): try either only encrypted or plaintext name"',
-    'Revert "eCryptfs: don\'t pass up plaintext names when',
     'update ESDFS to use changed FS API'
 ]
 topic_fixups['net'] = [