From: Greg KH <greg@kroah.com>
To: Jens Axboe <jens.axboe@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Alan Stern <stern@rowland.harvard.edu>
Subject: Re: linux-next: manual merge of the usb tree with the block tree
Date: Tue, 2 Mar 2010 15:10:59 -0800 [thread overview]
Message-ID: <20100302231059.GA32440@kroah.com> (raw)
In-Reply-To: <20100301080402.GP5768@kernel.dk>
On Mon, Mar 01, 2010 at 09:04:03AM +0100, Jens Axboe wrote:
> On Mon, Mar 01 2010, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/storage/scsiglue.c between commit
> > 086fa5ff0854c676ec333760f4c0154b3b242616 ("block: Rename
> > blk_queue_max_sectors to blk_queue_max_hw_sectors") from the block tree
> > and commit 628726dbb5ebbec77336019ac4e1f60cf3ba08c1 ("usb-storage: use
> > max_hw_sectors instead of max_sectors") from the usb tree.
> >
> > Just context changes. I fixed it up (see below) and can carry the fix as
> > necessary.
>
> Thanks Stephen, looks good.
I've made these changes in the patch set I sent to Linus.
thanks,
greg k-h
prev parent reply other threads:[~2010-03-02 23:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 7:54 linux-next: manual merge of the usb tree with the block tree Stephen Rothwell
2010-03-01 8:04 ` Jens Axboe
2010-03-02 23:10 ` Greg KH [this message]
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=20100302231059.GA32440@kroah.com \
--to=greg@kroah.com \
--cc=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sfr@canb.auug.org.au \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).