From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Suren Baghdasaryan <surenb@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the mm tree
Date: Tue, 7 Jan 2025 08:14:52 +1100 [thread overview]
Message-ID: <20250107081452.4294c7fd@canb.auug.org.au> (raw)
In-Reply-To: <CAJuCfpEyhm3OoeOqfnYVoOo+C4PafX1zXakPb+wjCFB_9Q9NnA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
Hi Suren,
On Mon, 6 Jan 2025 12:21:14 -0800 Suren Baghdasaryan <surenb@google.com> wrote:
>
> On Sun, Jan 5, 2025 at 7:09 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I got 2 more conflicts today due to the duplicate patch above.
>
> Have you been able to resolve the conflicts? Can I help with that?
I just use the version from the mm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-01-06 21:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-09 2:24 linux-next: manual merge of the tip tree with the mm tree Stephen Rothwell
2025-01-06 3:09 ` Stephen Rothwell
2025-01-06 20:21 ` Suren Baghdasaryan
2025-01-06 21:14 ` Stephen Rothwell [this message]
2025-01-06 21:15 ` Suren Baghdasaryan
-- strict thread matches above, loose matches on Subject: below --
2025-03-07 4:14 Stephen Rothwell
2025-03-07 7:20 ` Thomas Weißschuh
2025-03-07 7:58 ` Andrew Morton
2025-03-07 21:54 ` Jeff Xu
2025-02-24 3:42 Stephen Rothwell
2025-02-24 5:50 ` Anshuman Khandual
2025-03-26 1:05 ` Stephen Rothwell
2025-01-10 2:47 Stephen Rothwell
2024-09-11 5:16 Stephen Rothwell
2024-09-05 5:35 Stephen Rothwell
2024-09-10 23:23 ` Stephen Rothwell
2024-06-12 1:27 Stephen Rothwell
2024-07-16 23:27 ` Stephen Rothwell
2024-04-05 0:51 Stephen Rothwell
2024-04-07 23:50 ` Stephen Rothwell
2023-03-21 23:33 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=20250107081452.4294c7fd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--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=surenb@google.com \
--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