From: Mark Brown <broonie@kernel.org>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the mac80211-next tree with the mac80211 tree
Date: Thu, 3 Dec 2015 11:28:31 +0000 [thread overview]
Message-ID: <20151203112831.9800fd1675c04b69c1324cbb@kernel.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 445 bytes --]
Hi Johannes,
Today's linux-next merge of the mac80211-next tree got a conflict in
net/mac80211/cfg.c between commit c1df932c0574 ("mac80211: fix off-channel
mgmt-tx uninitialized variable usage") from the mac80211 tree and commit
a2aecd7d96ba ("mac80211: move off-channel/mgmt-tx code to offchannel.c") from
the mac80211-next tree.
I fixed it up resulting in an empty diff and can carry the fix as necessary (no
action is required).
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
next reply other threads:[~2015-12-03 11:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-03 11:28 Mark Brown [this message]
2018-01-16 0:13 linux-next: manual merge of the mac80211-next tree with the mac80211 tree Stephen Rothwell
2018-01-16 7:58 ` Johannes Berg
2019-04-09 1:06 Stephen Rothwell
2019-04-09 7:27 ` Johannes Berg
2019-04-09 8:11 ` 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=20151203112831.9800fd1675c04b69c1324cbb@kernel.org \
--to=broonie@kernel.org \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).