mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: David Heidelberg <david@ixit.cz>
To: Thierry Reding <thierry.reding@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: omission of the nfc tree
Date: Tue, 5 May 2026 11:47:10 +0200	[thread overview]
Message-ID: <6d26fbb6-3885-47b5-bfba-6c84bcc42f89@ixit.cz> (raw)
In-Reply-To: <e06a424df9659ec00dc929be6f50ac51@kernel.org>

Hello Thierry,

sorry about that, should be fixed (rebased against -rc2 now).

Is there strong insensitive to use -rc1? In case it causing additional work, I 
can stick with rc1.

David

On 04/05/2026 22:50, Thierry Reding wrote:
> Hi all,
> 
> Today's linux-next merge of the nfc tree got a conflict in a bunch of
> files. It looks like you based this tree on next-20260430 and this
> causes a bunch of old trees being pulled into today's linux next and
> that results in a lot of conflicts.
> 
> Your for-next branch should always be based on -rc1 or some later -rc
> if there's a need. It should *never* be based on a previous linux-next
> build.
> 
> I'm omitting the nfc tree today. Please fix this so that the tree can
> be included in linux-next.
> 
> Thanks,
> Thierry

-- 
David Heidelberg


  reply	other threads:[~2026-05-05  9:47 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-04 20:50 Thierry Reding
2026-05-05  9:47 ` David Heidelberg [this message]
2026-05-05 13:57   ` Thierry Reding
2026-05-06  2:21     ` Mark Brown

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=6d26fbb6-3885-47b5-bfba-6c84bcc42f89@ixit.cz \
    --to=david@ixit.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=thierry.reding@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®