From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>
Subject: linux-next: manual merge of the wireless-next tree with the net tree
Date: Tue, 12 Jun 2012 11:31:48 +1000 [thread overview]
Message-ID: <20120612113148.24f733ee30acb204faedce3a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1724 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in MAINTAINERS between commit ce466579b1c9 ("wireless: add my new trees to MAINTAINERS") from the net tree and commit 491b26b40222 ("wireless: update wireless URLs") from the wireless-next tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc MAINTAINERS
index f6e62de,c5fd905..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4351,9 -4339,8 +4351,9 @@@ F: arch/m68k/hp300
MAC80211
M: Johannes Berg <johannes@sipsolutions.net>
L: linux-wireless@vger.kernel.org
- W: http://linuxwireless.org/
+ W: http://wireless.kernel.org/
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
S: Maintained
F: Documentation/networking/mac80211-injection.txt
F: include/net/mac80211.h
@@@ -4363,9 -4350,8 +4363,9 @@@ MAC80211 PID RATE CONTRO
M: Stefano Brivio <stefano.brivio@polimi.it>
M: Mattias Nissler <mattias.nissler@gmx.de>
L: linux-wireless@vger.kernel.org
- W: http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
+ W: http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
S: Maintained
F: net/mac80211/rc80211_pid*
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-06-12 1:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-12 1:31 Stephen Rothwell [this message]
2012-06-12 1:41 linux-next: manual merge of the wireless-next tree with the net tree Stephen Rothwell
2012-06-15 0:23 ` Stephen Rothwell
2013-01-23 1:12 Stephen Rothwell
2013-06-04 2:43 Stephen Rothwell
2013-06-20 3:40 Stephen Rothwell
2022-02-17 0:09 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=20120612113148.24f733ee30acb204faedce3a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).