linux-next: manual merge of the accel tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  drivers/accel/habanalabs/common/device.c

between commits:

  3652117f8548 ("eventfd: simplify eventfd_signal()")
  b7638ad0c780 ("eventfd: make eventfd_signal{_mask}() void")

from Linus' tree and commit:

  1436a2242aa5 ("accel/habanalabs: check failure of eventfd_signal")

from the accel tree.

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