From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Darren Hart <dvhart@infradead•org>,
Andy Shevchenko <andy.shevchenko@gmail•com>,
Wim Van Sebroeck <wim@iguana•be>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Michael Shych <michaelsh@mellanox•com>,
Vadim Pasternak <vadimp@mellanox•com>
Subject: linux-next: manual merge of the drivers-x86 tree with the watchdog tree
Date: Mon, 4 Mar 2019 14:37:35 +1100 [thread overview]
Message-ID: <20190304143735.308edd1e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1498 bytes --]
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
include/linux/platform_data/mlxreg.h
between commit:
9f03161a1bd8 ("platform_data/mlxreg: additions for Mellanox watchdog driver.")
from the watchdog tree and commit:
9b28aa1d0eae ("platform_data/mlxreg: Document fixes for core platform data")
from the drivers-x86 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 include/linux/platform_data/mlxreg.h
index 31f7c25a44da,1b2f86f96743..000000000000
--- a/include/linux/platform_data/mlxreg.h
+++ b/include/linux/platform_data/mlxreg.h
@@@ -120,12 -109,9 +122,12 @@@ struct mlxreg_core_item
/**
* struct mlxreg_core_platform_data - platform data:
*
- * @led_data: led private data;
+ * @data: instance private data;
* @regmap: register map of parent device;
- * @counter: number of led instances;
+ * @counter: number of instances;
+ * @features: supported features of device;
+ * @version: implementation version;
+ * @identity: device identity name;
*/
struct mlxreg_core_platform_data {
struct mlxreg_core_data *data;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-03-04 3:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 3:37 Stephen Rothwell [this message]
2019-03-07 5:27 ` linux-next: manual merge of the drivers-x86 tree with the watchdog tree Darren Hart
2019-03-07 5:42 ` Darren Hart
-- strict thread matches above, loose matches on Subject: below --
2017-05-02 4:04 Stephen Rothwell
2017-05-02 18:09 ` Darren Hart
2017-05-02 19:12 ` Guenter Roeck
2017-05-02 20:21 ` Darren Hart
2017-05-02 20:57 ` Andy Shevchenko
2017-05-02 21:30 ` Darren Hart
2017-05-02 21:58 ` Guenter Roeck
2017-05-02 22:35 ` Darren Hart
2017-05-03 14:24 ` Wim Van Sebroeck
2017-05-03 14:43 ` Andy Shevchenko
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=20190304143735.308edd1e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andy.shevchenko@gmail$(echo .)com \
--cc=dvhart@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michaelsh@mellanox$(echo .)com \
--cc=vadimp@mellanox$(echo .)com \
--cc=wim@iguana$(echo .)be \
/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