camden@Caffeine:~/hadk/kernel/google/marlin$ git revert 1bb88fcb4961166195e2cb1973901ecf931983a1
Auto-merging drivers/tty/n_tty.c
Auto-merging drivers/tty/tty_buffer.c
CONFLICT (content): Merge conflict in drivers/tty/tty_buffer.c
Auto-merging drivers/tty/tty_io.c
Auto-merging drivers/tty/tty_ldisc.c
Auto-merging drivers/tty/tty_port.c
Auto-merging include/linux/tty.h
error: could not revert 1bb88fcb496... tty: move tty_port workqueue to be a kthread
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git revert --continue".
hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort".
Recorded preimage for 'drivers/tty/tty_buffer.c'
camden@Caffeine:~/hadk/kernel/google/marlin$ git revert 2074f5b7c3b6b00d8ed80738f4c9169a1599fc5a
error: Reverting is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: revert failed
camden@Caffeine:~/hadk/kernel/google/marlin$ git commit
U	drivers/tty/tty_buffer.c
error: Committing is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
camden@Caffeine:~/hadk/kernel/google/marlin$ git add .
camden@Caffeine:~/hadk/kernel/google/marlin$ git commit
Recorded preimage for 'drivers/tty/tty_buffer.c'
[detached HEAD 03825be76da] Revert "tty: move tty_port workqueue to be a kthread"
 6 files changed, 18 insertions(+), 24 deletions(-)
camden@Caffeine:~/hadk/kernel/google/marlin$ git commit
Not currently on any branch.
nothing to commit, working tree clean
camden@Caffeine:~/hadk/kernel/google/marlin$ git revert 2074f5b7c3b6b00d8ed80738f4c9169a1599fc5a
Auto-merging drivers/tty/tty_port.c
Auto-merging include/linux/tty.h
Recorded preimage for 'drivers/tty/tty_buffer.c'
[detached HEAD 64a02998325] Revert "tty: add tty_port_set_policy function"
 2 files changed, 12 deletions(-)
camden@Caffeine:~/hadk/kernel/google/marlin$ git revert 2074f5b7c3b6b00d8ed80738f4c9169a1599fc5a
Auto-merging drivers/tty/tty_port.c
Auto-merging include/linux/tty.h
Not currently on any branch.
nothing to commit, working tree clean