public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat•com>
To: Mark Brown <broonie@kernel•org>
Cc: dhowells@redhat•com, Sami Tolvanen <samitolvanen@google•com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Petr Pavlu <petr.pavlu@suse•com>
Subject: Re: linux-next: manual merge of the keys-next tree with the modules tree
Date: Fri, 30 Jan 2026 21:50:36 +0000	[thread overview]
Message-ID: <2280990.1769809836@warthog.procyon.org.uk> (raw)
In-Reply-To: <33417587-10b3-4cea-ad5f-595af16174fb@sirena.org.uk>

Mark Brown <broonie@kernel•org> wrote:

> > Thanks, Mark. David, I see the patches in keys-next were updated just
> > a few hours ago. Would it make sense for you to rebase them on top of
> > next-20260129? Petr's patch removed the use_signed_attrs variable, so
> > we should ensure it's still initialized correctly. Otherwise the
> > resolution looks trivial.
> 
> Please don't base anything on -next itself, that causes all kinds of
> problems and clearly isn't what you should be sending to Linus.

I was wondering if I should rebase on a merge between Eric's branch and Sami's
branch and "pre-handle" the conflict.

David


  parent reply	other threads:[~2026-01-30 21:50 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-30 17:20 linux-next: manual merge of the keys-next tree with the modules tree Mark Brown
2026-01-30 17:53 ` Sami Tolvanen
2026-01-30 17:57   ` David Howells
2026-01-30 18:10     ` Sami Tolvanen
2026-01-30 21:56       ` David Howells
2026-01-30 22:59         ` Sami Tolvanen
2026-01-30 18:06   ` Mark Brown
2026-01-30 18:13     ` Sami Tolvanen
2026-01-30 21:50     ` David Howells [this message]
2026-01-31 13:34       ` Mark Brown
2026-01-30 18:11 ` Mark Brown
2026-01-30 18:13   ` Sami Tolvanen
2026-01-30 18:18     ` Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2026-02-03 19:18 Mark Brown
2026-02-03 19:26 ` Sami Tolvanen
2026-02-03 19:30   ` 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=2280990.1769809836@warthog.procyon.org.uk \
    --to=dhowells@redhat$(echo .)com \
    --cc=broonie@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=petr.pavlu@suse$(echo .)com \
    --cc=samitolvanen@google$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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