linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Mickaël Salaün" <mic@digikod.net>
To: Thomas Gleixner <tglx@linutronix.de>,
	Richard Weinberger <richard@nod.at>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the landlock tree with the tip tree
Date: Tue, 20 Jun 2023 11:10:51 +0200	[thread overview]
Message-ID: <b57481af-5824-72f7-d20f-cfd78fcde519@digikod.net> (raw)
In-Reply-To: <20230620135536.1f820a48@canb.auug.org.au>

Hi Thomas,

There is a (trivial) merge conflict because one of your commits adds 
ARCH_HAS_CPU_FINALIZE_INIT and one of mine removes ARCH_EPHEMERAL_INODES 
in arch/um/Kconfig.

I don't plan to add more commits to my tree until the merge window and 
I'd like to send a PR to Linus as soon as it is open. Would that be OK 
with you to let Linus deal with this trivial conflict or do you prefer 
one of us to rebase on the other's tree?

Regards,
  Mickaël


On 20/06/2023 05:55, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the landlock tree got a conflict in:
> 
>    arch/um/Kconfig
> 
> between commit:
> 
>    9349b5cd0908 ("um/cpu: Switch to arch_cpu_finalize_init()")
> 
> from the tip tree and commit:
> 
>    74ce793bcbde ("hostfs: Fix ephemeral inodes")
> 
> from the landlock 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.
> 

      reply	other threads:[~2023-06-20  9:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-20  3:55 linux-next: manual merge of the landlock tree with the tip tree Stephen Rothwell
2023-06-20  9:10 ` Mickaël Salaün [this message]

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=b57481af-5824-72f7-d20f-cfd78fcde519@digikod.net \
    --to=mic@digikod.net \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=richard@nod.at \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).