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

[Stephen Rothwell]

Hi all,

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

  Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo

between commit:

  ebab9426cd73 ("Documentation/ABI: Fix typos")

from the jc_docs tree and commit:

  2cd9ec2a5147 ("docs: ABI: fix spelling/grammar in SBEFIFO timeout interface")

from the char-misc tree.

I fixed it up (the latter is a superset of the former) 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: pgp3fRzrz8hvg.pgp
Description: OpenPGP digital signature