linux-next: manual merge of the akpm tree with the jc_docs tree
diff mbox series

Message ID 20201201201811.72273de8@canb.auug.org.au
State New, archived
Headers show
Series
  • linux-next: manual merge of the akpm tree with the jc_docs tree
Related show

Commit Message

Stephen Rothwell Dec. 1, 2020, 9:18 a.m. UTC
Hi all,

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

  Documentation/dev-tools/kasan.rst

between commit:

  1a37e18bd4b9 ("Documentation: fix typos in dev-tools/kasan.rst")

from the jc_docs tree and commit:

  bb26c2574ff9 ("kasan: update documentation")

from the akpm 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.

Patch
diff mbox series

diff --cc Documentation/dev-tools/kasan.rst
index 6d9abe57feaa,0d5d77919b1a..000000000000
--- a/Documentation/dev-tools/kasan.rst