All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"John W. Linville" <linville@tuxdriver.com>,
	"David S. Miller" <davem@davemloft.net>,
	Johannes Berg <johannes@sipsolutions.net>,
	Holger Schurig <hs4233@mail.mn-solutions.de>
Subject: Re: linux-next: manual merge of the staging tree with the net/wireless tree
Date: Tue, 27 Oct 2009 07:13:25 -0700	[thread overview]
Message-ID: <20091027141325.GA17352@kroah.com> (raw)
In-Reply-To: <20091027183503.5c398311.sfr@canb.auug.org.au>

On Tue, Oct 27, 2009 at 06:35:03PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got conflicts in
> drivers/net/wireless/Kconfig between commits
> 3d23e349d807177eaf519d444677cee86b1a04cf ("wext: refactor") and
> 0465af8e03bdc6cd0b49dc5548671387a8674b69 ("libertas: separate libertas'
> Kconfig in it's own file") from the net/wireless tree and various commits
> ("... move driver to staging") from the staging tree.
> 
> I fixed it up (see below) and added a merge fixup (see further below) and
> can carry these as necessary (though it may be easier for everyone (i.e.
> me :-)) if these 4 staging tree commits are moved to the wireless
> tree ...).

John, I have no objection to these 4 commits going through your tree, if
it will make these types of merge issues go away.  If so, I have 4 more
patches that should be added, adding the TODO files for the drivers.  I
can send them to you if you want to take them.

thanks,

greg k-h

  reply	other threads:[~2009-10-27 14:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-27  7:35 linux-next: manual merge of the staging tree with the net/wireless tree Stephen Rothwell
2009-10-27 14:13 ` Greg KH [this message]
2009-10-27 14:56   ` John W. Linville
2009-10-27 16:23     ` 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=20091027141325.GA17352@kroah.com \
    --to=greg@kroah.com \
    --cc=davem@davemloft.net \
    --cc=hs4233@mail.mn-solutions.de \
    --cc=johannes@sipsolutions.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --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.