mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bill Pemberton <wfp5p@virginia.edu>,
	LKML <linux-kernel@vger.kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus <torvalds@linux-foundation.org>
Subject: Re: HOTPLUG replated patches
Date: Wed, 28 Nov 2012 14:16:13 -0800	[thread overview]
Message-ID: <20121128221613.GA13534@kroah.com> (raw)
In-Reply-To: <20121129090412.4fc1a6e5a41f9bc24b827c7c@canb.auug.org.au>

On Thu, Nov 29, 2012 at 09:04:12AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> I haven't been closely following things, but is there any reason that a
> large number of these CONFIG_HOTPLUG and __dev* patches are being merged
> via the driver-core tree rather than through the relevant maintainers
> trees? They aren't particularly urgent as far as I can see.  And they
> already have, and probably will, cause unnecessary conflicts between
> trees.

I merged the ones that were acked by the subsystem maintainer through my
driver-core tree.  Others are coming in through the subsystem
maintainer's trees, as they have applied them there.

So it's a mix, depending on the subsystem maintainer's wishes.

And yes, it's going to be a bunch of trivial merge issues, sorry about
that, I don't know of any other way at the moment to deal with that.

thanks,

greg k-h

      reply	other threads:[~2012-11-28 22:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-28 22:04 Stephen Rothwell
2012-11-28 22:16 ` Greg Kroah-Hartman [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=20121128221613.GA13534@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    --cc=wfp5p@virginia.edu \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®