From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Jassi Brar <jassisinghbrar@gmail•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nam Cao <namcao@linutronix•de>
Subject: linux-next: manual merge of the tip tree with the mailbox tree
Date: Mon, 3 Mar 2025 14:46:37 +1100 [thread overview]
Message-ID: <20250303144637.71c25bc3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 758 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/mailbox/mailbox.c
between commit:
791d7e70a9f4 ("mailbox: Switch to use hrtimer_setup()")
from the mailbox tree and commit:
c158a29c5c5b ("mailbox: Switch to use hrtimer_setup()")
from the tip tree.
I fixed it up (I just used the former - only a whitespace difference) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-03 3:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-03 3:46 Stephen Rothwell [this message]
2025-03-26 5:04 ` linux-next: manual merge of the tip tree with the mailbox tree Stephen Rothwell
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=20250303144637.71c25bc3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=jassisinghbrar@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=namcao@linutronix$(echo .)de \
--cc=peterz@infradead$(echo .)org \
--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