* linux-next: manual merge of driver-core tree
@ 2008-06-16 0:39 Stephen Rothwell
2008-06-17 3:14 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-06-16 0:39 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, James Bottomley, Mike Christie, Kay Sievers
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of driver-core tree
2008-06-16 0:39 linux-next: manual merge of driver-core tree Stephen Rothwell
@ 2008-06-17 3:14 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2008-06-17 3:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, James Bottomley, Mike Christie, Kay Sievers
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-06-17 3:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-16 0:39 linux-next: manual merge of driver-core tree Stephen Rothwell
2008-06-17 3:14 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox