From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linville@tuxdriver.com, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, ashok@cozybit.com,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the wireless-next tree with the net-next tree
Date: Wed, 02 May 2012 21:35:32 -0400 (EDT) [thread overview]
Message-ID: <20120502.213532.2065398707446945634.davem@davemloft.net> (raw)
In-Reply-To: <20120503113110.3eded43c5dc526a471c69dd2@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 May 2012 11:31:10 +1000
> Today's linux-next merge of the wireless-next tree got a conflict in
> net/wireless/nl80211.c between commit 9360ffd18597 ("wireless: Stop using
> NLA_PUT*()") from the net-next tree and commit 0a9b3782ef40 ("{nl,cfg,mac}
> 80211: Allow user to see/configure HT protection mode") from the
> wireless-next tree.
John, the NLA_PUT macros were removed from the net-next tree more
than a month ago.
There is zero reason why this should still be happening, and this
issue is causing a large, unnecessary, burdon upon Stephen.
Please take care of this, thanks.
next prev parent reply other threads:[~2012-05-03 1:38 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-03 1:31 linux-next: manual merge of the wireless-next tree with the net-next tree Stephen Rothwell
2012-05-03 1:35 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-11 1:10 Stephen Rothwell
2014-03-07 1:07 Stephen Rothwell
2013-09-27 3:19 Stephen Rothwell
2013-06-27 4:23 Stephen Rothwell
2013-06-27 7:34 ` Berg, Johannes
2013-06-04 2:33 Stephen Rothwell
2013-02-11 2:33 Stephen Rothwell
2013-02-11 2:58 ` Joe Perches
2013-02-11 6:47 ` Luciano Coelho
2013-02-11 7:40 ` Stephen Rothwell
2013-02-11 7:53 ` Luciano Coelho
2012-06-28 2:40 Stephen Rothwell
2012-04-24 2:48 Stephen Rothwell
2012-04-24 5:07 ` Grumbach, Emmanuel
2012-04-16 2:49 Stephen Rothwell
2012-04-16 2:49 Stephen Rothwell
2012-04-16 2:48 Stephen Rothwell
2012-04-13 2:41 Stephen Rothwell
2012-04-13 2:49 ` Stephen Rothwell
2012-04-13 2:30 Stephen Rothwell
2012-04-13 2:51 ` Stephen Rothwell
2012-04-11 2:56 Stephen Rothwell
2012-04-10 1:32 Stephen Rothwell
2012-03-16 1:58 Stephen Rothwell
2012-02-01 2:39 Stephen Rothwell
2012-01-05 3:04 Stephen Rothwell
2012-01-05 3:12 ` Larry Finger
2012-01-05 3:30 ` David Miller
2012-01-05 3:45 ` Stephen Rothwell
2011-12-21 11:59 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=20120502.213532.2065398707446945634.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=ashok@cozybit.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 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).