All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Corbet <corbet@lwn.net>
To: Mark Brown <broonie@kernel.org>
Cc: Alex Hung <alex.hung@amd.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Harry Wentland <harry.wentland@amd.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Sasha Levin <sashal@kernel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the mm-nomm-stable tree
Date: Tue, 31 Mar 2026 07:15:35 -0600	[thread overview]
Message-ID: <87341gm96w.fsf@trenco.lwn.net> (raw)
In-Reply-To: <acu9nEoNNDLSiu6i@sirena.org.uk>

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

  reply	other threads:[~2026-03-31 13:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-31 12:27 linux-next: manual merge of the jc_docs tree with the mm-nomm-stable tree Mark Brown
2026-03-31 13:15 ` Jonathan Corbet [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-01-26 16:41 Mark

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87341gm96w.fsf@trenco.lwn.net \
    --to=corbet@lwn.net \
    --cc=akpm@linux-foundation.org \
    --cc=alex.hung@amd.com \
    --cc=broonie@kernel.org \
    --cc=harry.wentland@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sashal@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.