# linux-next: manual merge of the wireless-next tree with the net-next tree

- From: Stephen Rothwell \<hidden\>
- Date: 2014-03-07 01:07:35 
- List: netdev
- Page: https://ratatoskr.run/netdev/2014/03/4213054

```text
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@canb.auug.org.au
```

## Attachments

- [(unnamed)](https://ratatoskr.run/netdev/2014/03/4213054/attachment/0) (application/pgp-signature, 836 bytes)