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

[Jonathan Corbet]

Mark Brown <broonie@xxxxxxxxxx> 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