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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 12 Oct 2020 19:13:40 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Shuah Khan <skhan@...uxfoundation.org>,
        Corey Minyard <cminyard@...sta.com>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Xianting Tian <tian.xianting@....com>
Subject: 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 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"
  

Content of type "application/pgp-signature" skipped