linux-kernel - linux-next: manual merge of the mac80211-next tree with the mac80211 tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20151203112831.9800fd1675c04b69c1324cbb@kernel.org>
Date:	Thu, 3 Dec 2015 11:28:31 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Johannes Berg <johannes@...solutions.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the mac80211-next tree with the
 mac80211 tree

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).

Content of type "application/pgp-signature" skipped