Hi all, Today's linux-next merge of the char-misc tree got a conflict in drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some of the legacy iSeries specific device drivers") from the powerpc tree and commit 5fb15db4376f ("char: Fix typo in viotape.c") from the char-misc tree. The former removed this file, so I did that. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpb03W8fz9r0.pgp
Description: PGP signature