Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/ath/ath9k/recv.c between commit 67ddc87f162e ("Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net") from the
net-next tree and commit f3b6a488a670 ("Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless") from
the wireless-next tree.
I fixed it up (I used the version from the wireless-next tree) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpXP7z_VbQkO.pgp
Description: PGP signature
