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,
	Lucas De Marchi <lucas.demarchi@profusion.mobi>,
	Roland Vossen <rvossen@broadcom.com>
Subject: Re: linux-next: manual merge of the staging tree with Linus' tree
Date: Wed, 13 Apr 2011 12:18:42 -0700	[thread overview]
Message-ID: <20110413191842.GA13359@kroah.com> (raw)
In-Reply-To: <20110408154756.538a59f2.sfr@canb.auug.org.au>

On Fri, Apr 08, 2011 at 03:47:56PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/README between commit 25985edcedea ("Fix common
> misspellings") from Linus' tree and commit 4a266c4fc99d ("staging:
> brcm80211: moved several README items to website") from the staging tree.
> 
> The latter removed the text that the former fixed up, so I did that.

Ok, all of the staging-next tree merge issues with Linus's tree should
now be resolved.  Please let me know if there are any that I missed.

thanks,

greg k-h

  parent reply	other threads:[~2011-04-13 19:19 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-08  5:47 linux-next: manual merge of the staging tree with Linus' tree Stephen Rothwell
2011-04-08 20:55 ` Greg KH
2011-04-13 19:18 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-07-20  5:25 Stephen Rothwell
2020-07-20  7:37 ` Greg KH
2018-06-06  9:12 Stephen Rothwell
2018-06-06  9:47 ` Greg KH
2018-06-06  9:08 Stephen Rothwell
2018-06-06  9:10 ` Greg KH
2018-02-23  2:28 Stephen Rothwell
2018-02-23  9:49 ` Greg KH
2016-04-05  3:49 Stephen Rothwell
2016-04-11 16:57 ` Greg KH
2014-09-22  5:01 Stephen Rothwell
2014-09-22 14:31 ` Greg KH
2013-03-15  4:13 Stephen Rothwell
2013-03-15 15:01 ` Greg KH
2013-01-17  2:35 Stephen Rothwell
2013-01-18  0:42 ` Greg KH
2012-04-27  4:37 Stephen Rothwell
2012-04-27 17:05 ` Greg KH
2012-05-02 21:23 ` Greg KH
2012-02-10  4:48 Stephen Rothwell
2012-02-10  5:30 ` Greg KH
2012-02-14 21:31   ` Ramirez Luna, Omar
2012-02-14 22:37     ` Greg KH
2012-02-14 23:33       ` Ramirez Luna, Omar
2012-02-14 23:42         ` Greg KH
2012-02-10 19:01 ` Greg KH
2012-02-10  4:47 Stephen Rothwell
2012-02-10  5:30 ` Greg KH
2011-11-28  4:18 Stephen Rothwell
2011-11-28  5:13 ` Greg KH
2011-09-20  6:46 Stephen Rothwell
2011-09-20 12:53 ` Greg KH
2011-05-13  4:08 Stephen Rothwell
2011-05-13 23:12 ` Greg KH
2011-04-28  2:59 Stephen Rothwell
2011-04-28  3:06 ` Greg KH
2011-04-08  6:02 Stephen Rothwell
2011-04-08  6:00 Stephen Rothwell
2011-04-08  5:57 Stephen Rothwell
2011-04-08  5:54 Stephen Rothwell
2011-04-08  5:51 Stephen Rothwell
2009-12-09  5:34 Stephen Rothwell
2009-12-09 20:30 ` Greg KH
2009-12-09 23:08   ` 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:
  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=20110413191842.GA13359@kroah.com \
    --to=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lucas.demarchi@profusion.mobi \
    --cc=rvossen@broadcom.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.