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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]

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 counter_atomic32")

from the counters tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/char/ipmi/ipmi_msghandler.c
index 8774a3b8ff95,36c0b1be22fb..000000000000
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@@ -34,7 -34,7 +34,8 @@@
  #include <linux/uuid.h>
  #include <linux/nospec.h>
  #include <linux/vmalloc.h>
 +#include <linux/delay.h>
+ #include <linux/counters.h>
  
  #define IPMI_DRIVER_VERSION "39.2"
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1386 bytes --]

Hi all,

On Mon, 12 Oct 2020 19:13:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 tree and commit:
> 
>   dc87264ac991 ("drivers/char/ipmi: convert stats to use counter_atomic32")
> 
> from the counters tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> diff --cc drivers/char/ipmi/ipmi_msghandler.c
> index 8774a3b8ff95,36c0b1be22fb..000000000000
> --- a/drivers/char/ipmi/ipmi_msghandler.c
> +++ b/drivers/char/ipmi/ipmi_msghandler.c
> @@@ -34,7 -34,7 +34,8 @@@
>   #include <linux/uuid.h>
>   #include <linux/nospec.h>
>   #include <linux/vmalloc.h>
>  +#include <linux/delay.h>
> + #include <linux/counters.h>
>   
>   #define IPMI_DRIVER_VERSION "39.2"
>   

This is now a conflict between the counters tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]