Re: linux-next: manual merge of the tty tree with the powerpc-fixes tree

On Fri, Mar 05, 2021 at 12:05:23PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tty tree got a conflict in: > > drivers/tty/hvc/hvcs.c > > between commit: > > 386a966f5ce7 ("vio: make remove callback return void") > > from the powerpc-fixes tree and commit:

linux-next: manual merge of the tty tree with the powerpc-fixes tree

Hi all, Today's linux-next merge of the tty tree got a conflict in: drivers/tty/hvc/hvcs.c between commit: 386a966f5ce7 ("vio: make remove callback return void") from the powerpc-fixes tree and commit: fb8d350c291c ("tty: hvc, drop unneeded forward declarations") from the tty tree. I