public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Brendan Higgins <brendanhiggins@google.com>,
	Shuah Khan <skhan@linuxfoundation.org>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Paul Walmsley <paul@pwsan.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	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 akpm-current tree with the risc-v tree
Date: Thu, 17 Dec 2020 21:05:22 +1100	[thread overview]
Message-ID: <20201217210522.76217bb5@canb.auug.org.au> (raw)
In-Reply-To: <CAHp75VdVDZx_YzD5mwUqs=ezuy=Mt1s8UmWB3mg+MgMj5yqEkQ@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

Hi Andy,

On Thu, 17 Dec 2020 11:40:51 +0200 Andy Shevchenko <andy.shevchenko@gmail.com> wrote:
>
> Yeah, and it's slightly different. Perhaps RISC-V tree can handle this
> by moving Makefile entry somewhere else in the file.

Or just let Linus take care of it ...

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2020-12-17 10:06 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-14  9:21 linux-next: manual merge of the akpm-current tree with the risc-v tree Stephen Rothwell
2020-12-14 17:37 ` Andy Shevchenko
2020-12-15  0:55   ` Palmer Dabbelt
2020-12-17  1:25 ` Stephen Rothwell
2020-12-17  9:40   ` Andy Shevchenko
2020-12-17 10:05     ` Stephen Rothwell [this message]
2020-12-17 17:06     ` Palmer Dabbelt
  -- strict thread matches above, loose matches on Subject: below --
2021-06-01  6:27 Stephen Rothwell
2021-03-12  6:37 Stephen Rothwell
2021-05-06  1:33 ` Stephen Rothwell
2020-11-27  7:34 Stephen Rothwell
2020-12-17  1:26 ` Stephen Rothwell
2020-12-17  2:18   ` Kefeng Wang
2020-10-06 10:39 Stephen Rothwell
2020-10-07  4:32 ` Palmer Dabbelt
2020-10-07  4:48   ` Atish Patra
2020-10-07 21:58     ` Atish Patra
2020-07-10  7:44 Stephen Rothwell
2020-04-28  6:55 Stephen Rothwell
2019-09-02 11:48 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=20201217210522.76217bb5@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=andy.shevchenko@gmail.com \
    --cc=brendanhiggins@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=palmer@dabbelt.com \
    --cc=paul@pwsan.com \
    --cc=skhan@linuxfoundation.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