From: Matthew Wilcox <willy@infradead•org>
To: Guo Ren <guoren@kernel•org>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Guo Ren <guoren@linux•alibaba.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Subject: Re: linux-next: manual merge of the csky tree with the mm tree
Date: Tue, 15 Aug 2023 04:18:13 +0100 [thread overview]
Message-ID: <ZNrudXYzylps9xtG@casper.infradead.org> (raw)
In-Reply-To: <CAJF2gTRVG+yX7fktLru4U=OVKrTg73kTR5hirw1hh1P9c+MNOQ@mail.gmail.com>
On Tue, Aug 15, 2023 at 11:11:52AM +0800, Guo Ren wrote:
> On Tue, Aug 15, 2023 at 8:46 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the csky tree got a conflict in:
> >
> > arch/csky/abiv2/cacheflush.c
> >
> > between commit:
> >
> > 1222e1310d64 ("csky: implement the new page table range API")
> Could I take this patch into csky next tree to solve the conflict.
No. It depends on the predecessor patches in that series.
prev parent reply other threads:[~2023-08-15 3:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 0:46 linux-next: manual merge of the csky tree with the mm tree Stephen Rothwell
2023-08-15 3:11 ` Guo Ren
2023-08-15 3:18 ` Matthew Wilcox [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=ZNrudXYzylps9xtG@casper.infradead.org \
--to=willy@infradead$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=guoren@kernel$(echo .)org \
--cc=guoren@linux$(echo .)alibaba.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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