linux-next: manual merge of the xen-tip tree with the mm-hotfixes tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi all,

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

  drivers/xen/xenbus/xenbus_probe_frontend.c

between commit:

  5be5772b1f96 ("xenbus: add module description")

from the mm-hotfixes tree and commit:

  b40c54648158 ("xenbus: add module description")

from the xen-tip 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: pgpDaUxxVf9ce.pgp
Description: OpenPGP digital signature