linux-next: manual merge of the char-misc tree with the mm-stable tree

[Mark Brown]

Hi all,

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

  drivers/misc/sgi-xp/xpc_uv.c

between commit:

  579c6de3def20 ("sgi-xp: use higher-level allocator API")

from the mm-stable tree and commit:

  dbf69afe320eb ("misc: sgi-xp: Remove SGI XP drivers")

from the char-misc tree.

I fixed it up (see below) 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.

[The file is deleted.]

Attachment: signature.asc
Description: PGP signature