Hi Al,
On Fri, 17 Oct 2008 18:35:57 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the bdev tree got a conflict in
> drivers/ide/ide-floppy.c between commits from the ide tree and commit
> a55897a7d06734d1ae32124a5e19cb903c33b8e3 ("[PATCH] eliminate use of
> ->f_flags in block methods") from the bdev tree.
>
> Again you don't need to patch drivers/ide/ide-floppy.c any more, but
> drivers/ide/ide-gd.c instead. Patch below.
I got a bit harder after that ... so I have again dropped the bdev for
today.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp3k4sQACP14.pgp
Description: PGP signature
