From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Andy Lutomirski <luto@amacapital.net>,
Boqun Feng <boqun.feng@gmail.com>,
Huacai Chen <chenhuacai@kernel.org>,
Ingo Molnar <mingo@redhat.com>, Kees Cook <keescook@chromium.org>,
Paul McKenney <paulmck@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Waiman Long <longman@redhat.com>, WANG Xuerui <kernel@xen0n.name>,
Will Deacon <will@kernel.org>, Will Drewry <wad@chromium.org>,
Suren Baghdasaryan <surenb@google.com>
Subject: Re: [GIT PULL] header cleanups for 6.8
Date: Thu, 11 Jan 2024 08:32:42 +1100 [thread overview]
Message-ID: <20240111083215.1e5298f4@oak> (raw)
In-Reply-To: <ualbkbj75ulsbwbjuphntw7ztb45r2q7iysvxvklmyv5ndnvh7@zxr56mv33vyv>
[-- Attachment #1: Type: text/plain, Size: 829 bytes --]
Hi Kent,
On Wed, 10 Jan 2024 16:19:17 -0500 Kent Overstreet <kent.overstreet@linux.dev> wrote:
>
> There were two merge conflicts in arch headers in next; they looked
> pretty trivial. But now I'm wondering - do we have standard
> tools/process for recording what the merge conflict and resolution were?
> I'm sure we must.
For simple conflicts (like these) the easiest thing to do is just provide
lore URLs to my notifications:
https://lore.kernel.org/all/20231218170015.6018162e@canb.auug.org.au/
https://lore.kernel.org/all/20231218170547.5714468f@canb.auug.org.au/
for more complex cases, you might want to do the merge with Linus' tree in a
temporary branch of your tree and add a note pointing that out in case Linus
wants to check his own resolutions against yours.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-01-10 21:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 21:19 [GIT PULL] header cleanups for 6.8 Kent Overstreet
2024-01-10 21:32 ` Stephen Rothwell [this message]
2024-01-11 2:24 ` pr-tracker-bot
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=20240111083215.1e5298f4@oak \
--to=sfr@canb.auug.org.au \
--cc=boqun.feng@gmail.com \
--cc=chenhuacai@kernel.org \
--cc=keescook@chromium.org \
--cc=kent.overstreet@linux.dev \
--cc=kernel@xen0n.name \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=surenb@google.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=wad@chromium.org \
--cc=will@kernel.org \
/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