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

Hi Yoshinori, On Fri, 12 Jul 2019 14:49:00 +0900 Yoshinori Sato 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 pgpyTDaeN

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

On Fri, 12 Jul 2019 09:59:28 +0900, Stephen Rothwell wrote: > > [1 ] > Hi all, > > On Mon, 17 Jun 2019 11:40:11 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the net-next tree got conflicts in: > > > > arch/sh/configs/se7712_defconfig > > arch/sh/configs/se7721_defco

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

Hi all, On Mon, 17 Jun 2019 11:40:11 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got conflicts in: > > arch/sh/configs/se7712_defconfig > arch/sh/configs/se7721_defconfig > arch/sh/configs/titan_defconfig > > between commit: > > 7c04efc8d2ef ("sh: c

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

Hi all, On Mon, 17 Jun 2019 11:40:11 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got conflicts in: > > arch/sh/configs/se7712_defconfig > arch/sh/configs/se7721_defconfig > arch/sh/configs/titan_defconfig > > between commit: > > 7c04efc8d2ef ("sh: c

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

Hi all, Today's linux-next merge of the net-next tree got conflicts in: arch/sh/configs/se7712_defconfig arch/sh/configs/se7721_defconfig arch/sh/configs/titan_defconfig between commit: 7c04efc8d2ef ("sh: configs: Remove useless UEVENT_HELPER_PATH") from the sh tree and commit: a514