archive mirror
 help / color / mirror / Atom feed
From: Greg KH <>
To: Stephen Rothwell <>
Cc:, Kay Sievers <>,
	Jan Blunck <>,
	Andrew Morton <>
Subject: Re: linux-next: manual merge of the driver-core tree with the tracing tree
Date: Thu, 30 Apr 2009 22:22:56 -0700	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Fri, May 01, 2009 at 03:01:15PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the driver-core tree got a conflict in
> init/main.c between commit 02af61bb50f5d5f0322dbe5ab2a0d75808d25c7b
> ("tracing, kmemtrace: Separate include/trace/kmemtrace.h to kmemtrace
> part and tracepoint part") from the tracing tree and commit
> e6a9527dba81973b8fe7000f42c84b2ffbe98d65 ("driver-core: devtmpfs - driver
> core maintained /dev tmpfs") from the driver-core tree.
> Just simple overlapping additions.  I fixed it up (see below) and can
> carry the fix as necessary.

Thanks, it's a pretty trivial merge.

> [Aside:  the first I can find of this is the patch submission to LKML
> within the last day ... so "posted, reviewed, unit tested"?  I assume
> this has had some discussion somewhere, but Google doesn't know where.]

It was posted today for discussion, which didn't seem to happen.

It has been unit tested a lot in SuSE's kernels with review from our
kernel developers (hence the 3 signed-off-bys).   We use it to speed up
booting a lot because we have to use an initramfs (like all distros need
to for various reasons.)  It aleviates the udev coldplug issues a lot,
and the embedded developers have been very happy to see this (for some
reason they only like writing private emails, not to the list, which is


greg k-h

  reply	other threads:[~2009-05-01  5:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-01  5:01 linux-next: manual merge of the driver-core tree with the tracing tree Stephen Rothwell
2009-05-01  5:22 ` Greg KH [this message]
2009-05-02  5:13   ` linux-next procedures: (Was: Re: linux-next: manual merge of the driver-core tree with the tracing tree) Stephen Rothwell

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \

* 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 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).