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: David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	"John W. Linville" <linville@tuxdriver.com>,
	"Zhao, Gang" <gamerh2o@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the net-next tree
Date: Mon, 17 Mar 2014 11:30:10 -0700	[thread overview]
Message-ID: <20140317183010.GB10565@kroah.com> (raw)
In-Reply-To: <20140317190842.795b9d29db9a131a9cff91a9@canb.auug.org.au>

On Mon, Mar 17, 2014 at 07:08:42PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/wlan-ng/cfg80211.c between commit 3ead0d2e220e ("wlan-ng:
> fixup staging driver for removal of ieee80211_dsss_chan_to_freq") from
> the net-next tree and commit 4e5e9d7c66f0 ("staging: wlan-ng: replace
> function ieee80211_dsss_chan_to_freq()") from the staging tree.
> 
> I fixed it up (I used the staging tree version) and can carry the fix as
> necessary (no action is required).

Thanks, that sounds correct.

greg k-h

  reply	other threads:[~2014-03-17 18:28 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-17  8:08 linux-next: manual merge of the staging tree with the net-next tree Stephen Rothwell
2014-03-17  8:08 ` Stephen Rothwell
2014-03-17 18:30 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-23  3:47 Stephen Rothwell
2023-10-23  7:27 ` Greg KH
2021-08-02 23:33 Mark Brown
2021-08-03  8:57 ` Phillip Potter
2021-08-03  9:23   ` Arnd Bergmann
2021-08-09  7:55     ` Stephen Rothwell
2021-08-09 12:46       ` Phillip Potter
2021-08-09 20:00         ` Arnd Bergmann
2021-08-09 21:45           ` Phillip Potter
2019-02-28  4:52 Stephen Rothwell
2019-02-28  7:04 ` Greg KH
2018-03-15  7:35 Stephen Rothwell
2016-12-07  4:04 Stephen Rothwell
2016-12-07  7:02 ` Greg KH
2016-11-24  3:42 Stephen Rothwell
2016-10-21  1:21 Stephen Rothwell
2014-07-16  6:43 Stephen Rothwell
2014-07-16  6:43 ` Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-05-28  8:28 Stephen Rothwell
2014-05-28  8:28 ` Stephen Rothwell
2014-05-28 15:49 ` Greg KH
2014-03-27  5:09 Stephen Rothwell
2014-03-27  5:09 ` Stephen Rothwell
2014-03-27 19:14 ` Eric W. Biederman
2014-03-27 19:14   ` Eric W. Biederman
2013-05-29  4:14 Stephen Rothwell
2013-05-29  8:03 ` Greg KH
2013-01-23  4:45 Stephen Rothwell
2013-01-23  4:45 ` Stephen Rothwell
2013-01-23  4:52 ` Greg KH
2011-10-25  8:26 Stephen Rothwell
2011-10-25  8:26 ` 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=20140317183010.GB10565@kroah.com \
    --to=greg@kroah.com \
    --cc=davem@davemloft.net \
    --cc=gamerh2o@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@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.