From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Shuah Khan <skhan@linuxfoundation•org>,
Corey Minyard <cminyard@mvista•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Xianting Tian <tian.xianting@h3c•com>
Subject: linux-next: manual merge of the counters tree with the ipmi tree
Date: Mon, 12 Oct 2020 19:13:40 +1100 [thread overview]
Message-ID: <20201012191340.78ebbaea@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2020-10-12 8:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 8:13 Stephen Rothwell [this message]
2020-10-15 5:54 ` linux-next: manual merge of the counters tree with the ipmi tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201012191340.78ebbaea@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cminyard@mvista$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=skhan@linuxfoundation$(echo .)org \
--cc=tian.xianting@h3c$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox