From: Andrew Morton <akpm@linux-foundation•org>
To: Palmer Dabbelt <palmer@dabbelt•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Paul Walmsley <paul@pwsan•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
zong.li@sifive•com, rppt@linux•ibm.com
Subject: Re: linux-next: manual merge of the akpm-current tree with the rsic-v tree
Date: Fri, 29 May 2020 14:18:43 -0700 [thread overview]
Message-ID: <20200529141843.5bf4c1b34d896af3a8ccf059@linux-foundation.org> (raw)
In-Reply-To: <mhng-42a49fa7-9216-40d3-9862-d5bed0d97eec@palmerdabbelt-glaptop1>
On Thu, 28 May 2020 12:19:35 -0700 (PDT) Palmer Dabbelt <palmer@dabbelt•com> wrote:
> On Thu, 28 May 2020 02:22:11 PDT (-0700), Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> > arch/riscv/Kconfig
> >
> > between commit:
> >
> > b151fefd23b7 ("riscv: sort select statements alphanumerically")
>
> Andrew: Maybe it's easier if just drop the patch? It comes from a script, so I
> can just resurrect it when things are less busy.
>
That's OK - whoever merges second will have some trivial fixing to do,
not a big deal.
prev parent reply other threads:[~2020-05-29 21:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 9:22 linux-next: manual merge of the akpm-current tree with the rsic-v tree Stephen Rothwell
2020-05-28 19:19 ` Palmer Dabbelt
2020-05-29 21:18 ` Andrew Morton [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=20200529141843.5bf4c1b34d896af3a8ccf059@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=rppt@linux$(echo .)ibm.com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=zong.li@sifive$(echo .)com \
/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