From: Janosch Frank <frankja@linux•ibm.com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Christian Borntraeger <borntraeger@de•ibm.com>,
Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@kernel•org>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Andrew Donnellan <ajd@linux•ibm.com>,
Jinjie Ruan <ruanjinjie@huawei•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mark Rutland <mark.rutland@arm•com>
Subject: Re: linux-next: manual merge of the kvms390 tree with the tip tree
Date: Tue, 29 Jul 2025 16:01:17 +0200 [thread overview]
Message-ID: <d3da799c-bda6-4ac4-9adb-76261b1589ec@linux.ibm.com> (raw)
In-Reply-To: <20250729105655.286c0496@canb.auug.org.au>
On 7/29/25 2:56 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> include/linux/entry-common.h
>
> between commit:
>
> a70e9f647f50 ("entry: Split generic entry into generic exception and syscall entry")
>
> from the tip tree and commit:
>
> ee4a2e08c101 ("entry: Add arch_in_rcu_eqs()")
>
> from the kvms390 tree.
>
> I fixed it up (I used the former version of this file and applied the
> following merge fix patch) 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 29 Jul 2025 10:49:47 +1000
> Subject: [PATCH] fix up for "entry: Add arch_in_rcu_eqs()"
>
> interacting with "entry: Split generic entry into generic exception and
> syscall entry" from the tip tree.
The patch from tip was a code move so this looks fine to me.
prev parent reply other threads:[~2025-07-29 14:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 0:56 linux-next: manual merge of the kvms390 tree with the tip tree Stephen Rothwell
2025-07-29 14:01 ` Janosch Frank [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=d3da799c-bda6-4ac4-9adb-76261b1589ec@linux.ibm.com \
--to=frankja@linux$(echo .)ibm.com \
--cc=ajd@linux$(echo .)ibm.com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=ruanjinjie@huawei$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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