On Mon, Jan 25, 2021 at 12:47:46PM +1100, Stephen Rothwell wrote:
> Hi Stafford,
>
> On Mon, 25 Jan 2021 10:04:46 +0900 Stafford Horne wrote:
> >
> > Thank's I knew about this conflict but I was not sure the best way to
> > handle, I
> > was/am going to rebase the openrisc/for-next branch onto 5
Hi Stafford,
On Mon, 25 Jan 2021 10:04:46 +0900 Stafford Horne wrote:
>
> Thank's I knew about this conflict but I was not sure the best way to handle,
> I
> was/am going to rebase the openrisc/for-next branch onto 5.11-rc5 once
> released.
> I will resolve the conflict during the rebase so you
On Mon, Jan 25, 2021 at 09:05:06AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the openrisc tree got a conflict in:
>
> drivers/soc/litex/litex_soc_ctrl.c
>
> between commit:
>
> e6dc077b7dff ("soc: litex: Fix compile warning when device tree is not
> configure
Hi all,
Today's linux-next merge of the openrisc tree got a conflict in:
drivers/soc/litex/litex_soc_ctrl.c
between commit:
e6dc077b7dff ("soc: litex: Fix compile warning when device tree is not
configured")
from Linus' tree and commit:
3706f9f76a4f ("drivers/soc/litex: Add restart han
4 matches
Mail list logo
