Hi Al,
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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 5e5090a..c4f31de 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -198,7 +198,7 @@ static int ide_gd_open(struct inode *inode, struct file *filp)
* unreadable disk, so that we can get the format capacity
* of the drive or begin the format - Sam
*/
- if (ret && (filp->f_flags & O_NDELAY) == 0) {
+ if (ret && (filp->f_mode & FMODE_NDELAY) == 0) {
ret = -EIO;
goto out_put_idkp;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
