From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the driver-core.current tree
Date: Sun, 19 Oct 2008 20:47:56 -0700 [thread overview]
Message-ID: <20081020034756.GC26650@kroah.com> (raw)
In-Reply-To: <20081020114842.e6cd6f90.sfr@canb.auug.org.au>
On Mon, Oct 20, 2008 at 11:48:42AM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core.current tree got a conflict
> in Documentation/sysctl/kernel.txt between commit
> 061b1bd394ca8628b7c24eb4658ba3535da4249a ("Staging: add TAINT_CRAP for
> all drivers/staging code") from Linus' tree and commit
> ac7b643ad9c570efa0b5cbc9af5581db8c2faf64 ("Document kernel taint flags
> properly") from the driver-core.current tree.
That's odd, I'll check this tomorrow when I resync my tree (it still
contains a lot of stuff that is in Linus's tree right now), I haven't
had the chance to clean it out yet.
thanks,
greg k-h
next prev parent reply other threads:[~2008-10-20 3:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-20 0:48 linux-next: manual merge of the driver-core.current tree Stephen Rothwell
2008-10-20 3:47 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-07-24 0:57 Stephen Rothwell
2008-07-24 15:09 ` Greg KH
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=20081020034756.GC26650@kroah.com \
--to=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.