From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Brian King <brking@linux•vnet.ibm.com>,
James Bottomley <James.Bottomley@HansenPartnership•com>
Subject: Re: linux-next: manual merge of the driver-core tree with the scsi tree
Date: Tue, 9 Jun 2009 03:18:12 -0700 [thread overview]
Message-ID: <20090609101812.GA27305@kroah.com> (raw)
In-Reply-To: <20090609190415.3bfba32d.sfr@canb.auug.org.au>
On Tue, Jun 09, 2009 at 07:04:15PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/scsi/ibmvscsi/ibmvscsi.c between commit
> 126c5cc37e682e7c5ae96754994b1cb50c2d0cb5 ("[SCSI] ibmvscsi: Add support
> for capabilities MAD") from the scsi tree and commit
> 1e87031283511c775454ecd57f16a1a2de30aafa ("ibmvscsi: gadget: at91_udc:
> remove driver_data direct access of struct device") from the driver-core
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
The fix looks fine, thanks for doing this.
greg k-h
prev parent reply other threads:[~2009-06-09 10:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 9:04 linux-next: manual merge of the driver-core tree with the scsi tree Stephen Rothwell
2009-06-09 10:18 ` 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=20090609101812.GA27305@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=brking@linux$(echo .)vnet.ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--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