linux-next: manual merge of the iwlwifi-next tree with the net-next tree

[Stephen Rothwell]

Hi all,

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

  drivers/net/wireless/intel/iwlwifi/dvm/main.c

between commit:

  90a0d9f33996 ("iwlwifi: Add missing check for alloc_ordered_workqueue")

from the net-next tree and commit:

  511b136d072c ("iwlwifi: Add missing check for alloc_ordered_workqueue")

from the iwlwifi-next tree.

I fixed it up (I just used the latter version) 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: pgpv8IExc5asb.pgp
Description: OpenPGP digital signature