Hi all, Today's linux-next merge of the mm-stable tree got conflicts in: Documentation/translations/zh_CN/mm/free_page_reporting.rst Documentation/translations/zh_CN/mm/frontswap.rst Documentation/translations/zh_CN/mm/page_frags.rst Documentation/translations/zh_CN/mm/zsmalloc.rst between commits: 5fe84fe446d8 ("docs: zh_CN: page_frags.rst: fix a broken reference") 36395fb365df ("docs: zh_CN/vm: fix a typo for page reporting ReST file") 97e937dec70d ("docs: zh_CN/vm/zsmalloc.rst: fix a typo") from the jc_docs tree and commit: ee65728e103b ("docs: rename Documentation/vm to Documentation/mm") from the mm-stable 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. -- Cheers, Stephen Rothwell diff --cc Documentation/translations/zh_CN/mm/free_page_reporting.rst index 14336a3aa5f4,83b14cce9adf..000000000000 --- a/Documentation/translations/zh_CN/mm/free_page_reporting.rst +++ b/Documentation/translations/zh_CN/mm/free_page_reporting.rst @@@ -1,6 -1,6 +1,6 @@@ .. include:: ../disclaimer-zh_CN.rst - :Original: Documentation/vm/free_page_reporting.rst -:Original: Documentation/mm/_free_page_reporting.rst ++:Original: Documentation/mm/free_page_reporting.rst :翻译: diff --cc Documentation/translations/zh_CN/mm/frontswap.rst index 98aa6f581ea7,5c18ea2be04f..000000000000 --- a/Documentation/translations/zh_CN/mm/frontswap.rst +++ b/Documentation/translations/zh_CN/mm/frontswap.rst @@@ -1,4 -1,4 +1,4 @@@ - :Original: Documentation/vm/free_page_reporting.rst -:Original: Documentation/mm/_free_page_reporting.rst ++:Original: Documentation/mm/free_page_reporting.rst :翻译: diff --cc Documentation/translations/zh_CN/mm/page_frags.rst index 38ecddb9e1c0,320952ca93af..000000000000 --- a/Documentation/translations/zh_CN/mm/page_frags.rst +++ b/Documentation/translations/zh_CN/mm/page_frags.rst @@@ -1,4 -1,4 +1,4 @@@ - :Original: Documentation/vm/page_frags.rst -:Original: Documentation/mm/page_frag.rst ++:Original: Documentation/mm/page_frags.rst :翻译: diff --cc Documentation/translations/zh_CN/mm/zsmalloc.rst index 45a9b7ab2a51,b5596ea08ae4..000000000000 --- a/Documentation/translations/zh_CN/mm/zsmalloc.rst +++ b/Documentation/translations/zh_CN/mm/zsmalloc.rst @@@ -1,4 -1,4 +1,4 @@@ - :Original: Documentation/vm/zsmalloc.rst -:Original: Documentation/mm/zs_malloc.rst ++:Original: Documentation/mm/zsmalloc.rst :翻译:
Attachment:
pgpqsZI5WvXAq.pgp
Description: OpenPGP digital signature