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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 12 Jul 2019 16:23:07 +1000

Hi Yoshinori,

On Fri, 12 Jul 2019 14:49:00 +0900 Yoshinori Sato <[email-masked]> 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.

-- 
Cheers,
Stephen Rothwell