From: Al Viro <viro@ZenIV•linux.org.uk>
To: Bartlomiej Zolnierkiewicz <bzolnier@gmail•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>, linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the bdev tree
Date: Fri, 17 Oct 2008 12:14:23 +0100 [thread overview]
Message-ID: <20081017111423.GI28946@ZenIV.linux.org.uk> (raw)
In-Reply-To: <58cb370e0810170158p666c1dbcm6f7b08b4aa7bdffb@mail.gmail.com>
On Fri, Oct 17, 2008 at 10:58:42AM +0200, Bartlomiej Zolnierkiewicz wrote:
> Yes, the common ide-{disk,floppy}.c code resides now in ide-gd.c.
>
> > I got a bit harder after that ... so I have again dropped the bdev for
> > today.
>
> This may be actually my fault since I remember Al asking me about some
> conflicting
> changes during KS/LPC? (though I later forgot about it).
>
> Al, is stuff in bdev-next going in during this merge window? If so
> please push it
> to Linus ASAP and I'll take care of fixing IDE patches. Otherwise I'm
> going to push
> IDE stuff to Linus and you'll have to fixup bdev-next. ;-)
As the matter of fact, I've got bdev-next variant covering ide-gd, so
if you can push the relevant ide patch(es) to Linus, bdev would be ready
to go. Or I can push the mainline-based variant and send the pieces
that affect ide-gd your way (basically, it's a matter of f_mode/f_flags
stuff being touched in ide-gd instead of ide-floppy, converting your
disk_ops->ioctl() to sane prototype and converting ide-gd.c to new
bdev method prototypes). Up to you...
Al, trying to order the VFS patch-pile into mergable shape right now...
next prev parent reply other threads:[~2008-10-17 11:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2008-10-17 13:24 ` Bartlomiej Zolnierkiewicz
-- strict thread matches above, loose matches on Subject: below --
2008-10-17 7:29 Stephen Rothwell
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=20081017111423.GI28946@ZenIV.linux.org.uk \
--to=viro@zeniv$(echo .)linux.org.uk \
--cc=bzolnier@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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