From: "John W. Linville" <linville@tuxdriver.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, Wey-Yi Guy <wey-yi.w.guy@intel.com>,
Johannes Berg <johannes.berg@intel.com>
Subject: Re: linux-next: manual merge of the net-next tree with the tree
Date: Mon, 5 Dec 2011 09:53:21 -0500 [thread overview]
Message-ID: <20111205145320.GA2531@tuxdriver.com> (raw)
In-Reply-To: <20111205153416.e1dd01e5368ce7c016d99a59@canb.auug.org.au>
On Mon, Dec 05, 2011 at 03:34:16PM +1100, Stephen Rothwell wrote:
> On Mon, 5 Dec 2011 12:34:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the net-next tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-agn.c between commits from the
>
> wireless (sorry)
>
> > tree and commit 7335613ae27a ("iwlwifi: move all mac80211 related
> > functions to one place") from the net-next tree.
> >
> > I just used the net-next version (which may require some fixes).
Yeah, I'll try to get that straightened-out over the next day or two.
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2011-12-05 15:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-05 1:34 linux-next: manual merge of the net-next tree with the tree Stephen Rothwell
2011-12-05 1:34 ` Stephen Rothwell
2011-12-05 4:34 ` Stephen Rothwell
2011-12-05 4:34 ` Stephen Rothwell
2011-12-05 14:53 ` John W. Linville [this message]
2011-12-05 15:42 ` wwguy
-- strict thread matches above, loose matches on Subject: below --
2012-05-21 2:27 Stephen Rothwell
2012-05-21 2:27 ` Stephen Rothwell
2012-06-20 3:18 Stephen Rothwell
2012-06-20 3:18 ` Stephen Rothwell
2014-03-11 12:07 Mark Brown
2014-03-11 12:07 ` Mark Brown
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=20111205145320.GA2531@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wey-yi.w.guy@intel.com \
/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.