From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
James Bottomley <James.Bottomley@HansenPartnership•com>,
Mike Christie <michaelc@cs•wisc.edu>,
Kay Sievers <kay.sievers@vrfy•org>
Subject: Re: linux-next: manual merge of driver-core tree
Date: Mon, 16 Jun 2008 20:14:19 -0700 [thread overview]
Message-ID: <20080617031419.GA1088@kroah.com> (raw)
In-Reply-To: <20080616103906.35926c45.sfr@canb.auug.org.au>
On Mon, Jun 16, 2008 at 10:39:06AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a context conflict
> in drivers/scsi/hosts.c between commit
> 3ed7897242b7efe977f3a8d06d4e5a4ebe28b10e ("[SCSI] scsi_host regression:
> fix scsi host leak") from the scsi-rc-fixes (presumably soon to be
> Linus') tree and commit d2523cff4094586032a5b0820ca86fbae6424dc0 ("Driver
> Core: add ability for class_find_device to start in middle of list") from
> the driver-core tree.
>
> It is trivial and I fixed it up.
Great, thanks for doing this.
greg k-h
prev parent reply other threads:[~2008-06-17 3:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-16 0:39 linux-next: manual merge of driver-core tree Stephen Rothwell
2008-06-17 3:14 ` 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=20080617031419.GA1088@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michaelc@cs$(echo .)wisc.edu \
--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