linux-next: manual merge of the jc_docs tree with the mm-nomm-stable tree

linux-next: manual merge of the jc_docs tree with the mm-nomm-stable tree

[Mark]

[-- Attachment #1: Type: text/plain, Size: 942 bytes --]

Hi all,

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

  Documentation/core-api/kho/index.rst

between commit:

  35c554410d81c ("kho: docs: combine concepts and FDT documentation")

from the mm-nomm-stable tree and commit:

  a592a36e49372 ("Documentation: use a source-read extension for the index link boilerplate")

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

diff --cc Documentation/core-api/kho/index.rst
index dcc6a36cc134c,51ea41c6a20d5..0000000000000
--- a/Documentation/core-api/kho/index.rst
+++ b/Documentation/core-api/kho/index.rst

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the jc_docs tree with the mm-nomm-stable tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]

Hi all,

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

  scripts/checkpatch.pl

between commit:

  d1db4118489ff ("checkpatch: add support for Assisted-by tag")

from the mm-nomm-stable tree and commit:

  8545d9bc4bd08 ("scripts/checkpatch: add Assisted-by: tag validation")

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

(The mm version does seem to misidentify as a signoff)

diff --cc scripts/checkpatch.pl
index 60fd2ee2d0e58,b8d961d77ff4e..0000000000000
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@@ -3106,11 -3106,11 +3106,11 @@@ sub process 
  				}
  			}
  
 -# Assisted-by: uses format AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] instead of email
 +			# Assisted-by uses AGENT_NAME:MODEL_VERSION format, not email
- 			if ($sign_off =~ /^Assisted-by:/i) {
- 				if ($email !~ /^\S+:\S+/) {
- 					WARN("BAD_SIGN_OFF",
- 					     "Assisted-by expects 'AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]' format\n" . $herecurr);
+ 			if ($sign_off =~ /^assisted-by:$/i) {
+ 				if ($email !~ /^[^:]+:\S+(\s+\S+)*$/) {
+ 					WARN("BAD_ASSISTED_BY",
+ 					     "Assisted-by: should use format: 'Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]'\n" . $herecurr);
  				}
  				next;
  			}

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the jc_docs tree with the mm-nomm-stable tree

[Jonathan Corbet]

Mark Brown <broonie@kernel.org> writes:

> Hi all,
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
>   scripts/checkpatch.pl
>
> between commit:
>
>   d1db4118489ff ("checkpatch: add support for Assisted-by tag")
>
> from the mm-nomm-stable tree and commit:
>
>   8545d9bc4bd08 ("scripts/checkpatch: add Assisted-by: tag validation")
>
> from the jc_docs tree.

Ah...I didn't realize that somebody had already addressed that problem.
Certainly we don't need two of them.  I can drop mine.

Thanks,

jon