From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>
Cc: linux-next@vger•kernel.org,
Bartlomiej Zolnierkiewicz <bzolnier@gmail•com>
Subject: linux-next: manual merge of the bdev tree
Date: Fri, 17 Oct 2008 18:29:33 +1100 [thread overview]
Message-ID: <20081017182933.172f6f84.sfr@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the bdev tree got a conflict in
drivers/ide/ide-floppy.c between commit idefloppy_open ("ide-floppy:
factor out generic disk handling code to ide-gd-floppy.c") from the ide
tree and commit 30819ee65ed2e69fab5d5986ae0177795615a7fc ("[PATCH]
introduce fmode_t, do annotations") from the bdev tree.
The former moved the code that the latter modified. You no longer need
to patch drivers/ide/ide-floppy.c - I think you need to patch
drivers/ide/ide-gd.c instead. I added the patch below.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index d44898f..5e5090a 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -7,6 +7,7 @@
#include <linux/mutex.h>
#include <linux/ide.h>
#include <linux/hdreg.h>
+#include <linux/fs.h>
#if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
#define IDE_DISK_MINORS (1 << PARTN_BITS)
@@ -202,7 +203,7 @@ static int ide_gd_open(struct inode *inode, struct file *filp)
goto out_put_idkp;
}
- if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & 2)) {
+ if ((drive->dev_flags & IDE_DFLAG_WP) && (filp->f_mode & FMODE_WRITE)) {
ret = -EROFS;
goto out_put_idkp;
}
next reply other threads:[~2008-10-17 7:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-17 7:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-17 7:35 linux-next: manual merge of the bdev tree Stephen Rothwell
2008-10-17 7:42 ` Stephen Rothwell
2008-10-17 8:58 ` Bartlomiej Zolnierkiewicz
2008-10-17 11:14 ` Al Viro
2008-10-17 13:24 ` Bartlomiej Zolnierkiewicz
2008-10-16 8:48 Stephen Rothwell
2008-09-18 6:23 Stephen Rothwell
2008-09-18 6:11 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081017182933.172f6f84.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bzolnier@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox