Hi all,
On Tue, 2 Jun 2020 19:30:48 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> kernel/trace/bpf_trace.c
>
> between commit:
>
> b36e62eb8521 ("bpf: Use strncpy_from_unsafe_strict() in bpf_seq_printf()
> helper")
>
> from the net-ne
Hi Marc,
On Tue, 7 Feb 2017 09:40:09 +0100 Marc Kleine-Budde wrote:
>
> On 02/07/2017 06:23 AM, Stephen Rothwell wrote:
> > diff --cc drivers/net/can/flexcan.c
> > index ea57fed375c6,4dc71bce525c..
> > --- a/drivers/net/can/flexcan.c
> > +++ b/drivers/net/can/flexcan.c
> > @@@ -195,9
On 02/07/2017 06:23 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> drivers/net/can/flexcan.c
>
> between commits:
>
> 9eb7aa891101 ("can: flexcan: add quirk FLEXCAN_QUIRK_ENABLE_EACEN_RRS")
> b3cf53e988ce ("can: flexcan: add s
