* linux-next: manual merge of the bkl-trivial tree with the block tree
@ 2010-09-27 4:45 Stephen Rothwell
2010-09-27 7:05 ` Arnd Bergmann
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-09-27 4:45 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, Vivek Goyal, Jens Axboe
Hi Arnd,
Today's linux-next merge of the bkl-trivial tree got a conflict in
drivers/block/ataflop.c between commit
639e2f2aa76eefaf22078dccbbf2f3483f587aa7 ("atari floppy: Stop sharing
request queue across multiple gendisks") from the block tree and commit
5778067afcfd8b718ffc3744c25fdd194fc886a1 ("block: autoconvert trivial BKL
users to private mutex") from the bkl-trivial tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/block/ataflop.c
index 0f4eec4,8c021bb..0000000
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@@ -79,8 -79,9 +79,9 @@@
#undef DEBUG
+ static DEFINE_MUTEX(ataflop_mutex);
-static struct request_queue *floppy_queue;
static struct request *fd_request;
+static int fdc_queue;
/* Disk types: DD, HD, ED */
static struct atari_disk_type {
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the bkl-trivial tree with the block tree
2010-09-27 4:45 linux-next: manual merge of the bkl-trivial tree with the block tree Stephen Rothwell
@ 2010-09-27 7:05 ` Arnd Bergmann
0 siblings, 0 replies; 2+ messages in thread
From: Arnd Bergmann @ 2010-09-27 7:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Vivek Goyal, Jens Axboe
On Monday 27 September 2010 06:45:19 Stephen Rothwell wrote:
>
> #undef DEBUG
>
> + static DEFINE_MUTEX(ataflop_mutex);
> -static struct request_queue *floppy_queue;
> static struct request *fd_request;
> +static int fdc_queue;
>
> /* Disk types: DD, HD, ED */
> static struct atari_disk_type {
Looks good, thanks!
Vivek, since you are touching that file with other patches, are you interested
in taking the floppy part of my automated block driver BKL removal patch
as well?
I suspect it's possible to come up with a better solution than mine if you
know the code.
Arnd
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-27 7:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-27 4:45 linux-next: manual merge of the bkl-trivial tree with the block tree Stephen Rothwell
2010-09-27 7:05 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox