From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Helge Deller <deller@gmx•de>,
Parisc List <linux-parisc@vger•kernel.org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Arnd Bergmann <arnd@arndb•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the parisc-hd tree with the mm-nonmm-stable tree
Date: Wed, 28 Jun 2023 10:22:48 +1000 [thread overview]
Message-ID: <20230628102248.742b79e1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1027 bytes --]
Hi all,
Today's linux-next merge of the parisc-hd tree got a conflict in:
arch/parisc/kernel/smp.c
between commit:
ad1a48301f65 ("init: consolidate prototypes in linux/init.h")
from the mm-nonmm-stable tree and commit:
57d303096f1c ("parisc: Fix prototype warnings for time related functions")
from the parisc-hd tree.
I fixed it up (the latter also removes the line removed by the former)
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.
Not that the latter also adds a declaration of init_IRQ() to
arch/parisc/include/asm/processor.h which will not be needed after
merging with the mm-nonmm-stable tree (but is harmless, so I have left
it there for now).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2023-06-28 0:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230628102248.742b79e1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=deller@gmx$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
/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