linux-next: manual merge of the wireless-next tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  drivers/staging/ks7010/TODO

between commit:

  d93e795b8621 ("staging: ks7010: Remove unused driver")

from Linus' tree and commit:

  4991d2e7ad38 ("staging: don't recommend using lib80211")

from the wireless-next tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpm9Nvb8EQM5.pgp
Description: OpenPGP digital signature