* linux-next: manual import of the driver-core,current tree
@ 2008-10-20 0:01 Stephen Rothwell
2008-10-20 3:48 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-10-20 0:01 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
Hi Greg,
Today's linux-next import of the driver-core.current tree got a conflict
in document-kernel-taint-flags-properly.patch. It would not apply until
I removed the line
- 64 - A module from drivers/staging was loaded.
from the context.
--
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 import of the driver-core,current tree
2008-10-20 0:01 linux-next: manual import of the driver-core,current tree Stephen Rothwell
@ 2008-10-20 3:48 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2008-10-20 3:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
On Mon, Oct 20, 2008 at 11:01:19AM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next import of the driver-core.current tree got a conflict
> in document-kernel-taint-flags-properly.patch. It would not apply until
> I removed the line
>
> - 64 - A module from drivers/staging was loaded.
>
> from the context.
That's fine, I'll clean this all up tomorrow in the morning.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-10-20 3:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-20 0:01 linux-next: manual import of the driver-core,current tree Stephen Rothwell
2008-10-20 3:48 ` Greg KH
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).