linux-next: manual merge of the rust tree with the vfs-brauner tree

[Stephen Rothwell]

Hi all,

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

  rust/kernel/sync/poll.rs

between commit:

  6efbf978891b ("poll: rust: allow poll_table ptrs to be null")

from the vfs-brauner tree and commit:

  fcad9bbf9e1a ("rust: enable `clippy::ptr_as_ptr` lint")

from the rust tree.

I fixed it up (I used the former change) 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: pgpc2lPEcTQtt.pgp
Description: OpenPGP digital signature