Re: linux-next: manual merge of the net-next tree with the sh tree

Stephen Rothwell
2019-07-12T06:23:17Z

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

Hi Yoshinori,

On Fri, 12 Jul 2019 14:49:00 +0900 Yoshinori Sato <ysato@users.sourceforge.jp> wrote:
>
> I can not update sh-next now, so I will fix it tomorrow.

You don't need to (and should not) update your tree, just mention the
conflicts to Linus when you send your pull request.