Re: linux-next: manual merge of the counters tree with the ipmi tree

Hi all, On Mon, 12 Oct 2020 19:13:40 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the counters tree got a conflict in: > > drivers/char/ipmi/ipmi_msghandler.c > > between commit: > > f8910ffa81b0 ("ipmi:msghandler: retry to get device id on an error") > > from the ipmi

linux-next: manual merge of the counters tree with the ipmi tree

Hi all, Today's linux-next merge of the counters tree got a conflict in: drivers/char/ipmi/ipmi_msghandler.c between commit: f8910ffa81b0 ("ipmi:msghandler: retry to get device id on an error") from the ipmi tree and commit: dc87264ac991 ("drivers/char/ipmi: convert stats to use