Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/riscv/hwprobe.rst
between commit:
b98673c5b037 ("RISC-V: Probe for unaligned access speed")
from the risc-v tree and commit:
d56b699d76d1 ("Documentation: Fix typos")
from the jc_docs tree.
I fixed it up (I just used 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:
pgpUXe1QX9VhX.pgp
Description: OpenPGP digital signature
