linux-next: manual merge of the char-misc tree with the mm-stable tree
Mark Brown <[email protected]>
| Newsgroups | org.kernel.vger.linux-next,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
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.]
signature.asc
(application/pgp-signature, 488 B)
-----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmp0kf8ACgkQJNaLcl1U h9AbBAf/VqlCkwzfPRXVa7uhsP3IVYTA8uLb4DeUDaZiyv3AX2Abv53OEUgmDY+m tpF0paBMd8yRp+3dcvchwfdPcys9KfB55v9HjmYF6p4lcs8g2byLkYqnUYfnXIky IGIWz9AKHYtX9OT8Ryfh5eMKAdq8+7Pd4w4UOYI3CCnIR9eWG4dhP873cnomaOC8 JRF2q3lDA8Jj022eoguhaSNVL1TQBa5Pr5t4r+JMB3HT/T+STPuMmim4gPCwXYGZ UqdPwnUoX0lRI2kXqMrphGwpb9TXxyoGrmiJnEQlI6Qe5iD3kCbrgzTm77gAO7f4 1E6ewOJTGweST+OODVe0S+bxC65/kg== =gqKX -----END PGP SIGNATURE-----