From: Darren Hart <dvhart@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Wim Van Sebroeck <wim@iguana.be>,
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: Re: linux-next: manual merge of the drivers-x86 tree with the watchdog tree
Date: Wed, 6 Mar 2019 21:27:01 -0800 [thread overview]
Message-ID: <20190307052701.GC44339@wrath> (raw)
In-Reply-To: <20190304143735.308edd1e@canb.auug.org.au>
On Mon, Mar 04, 2019 at 02:37:35PM +1100, Stephen Rothwell wrote:
> 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.
Thanks Stephen.
I suspect this will be a rare occurence. That said - Vadim - could you please
ensure that all the mellanox driver changes Cc the platform driver x86 mailing
list by adding it to MAINTAINERS?
--
Darren Hart
VMware Open Source Technology Center
next prev parent reply other threads:[~2019-03-07 5:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 3:37 linux-next: manual merge of the drivers-x86 tree with the watchdog tree Stephen Rothwell
2019-03-07 5:27 ` Darren Hart [this message]
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=20190307052701.GC44339@wrath \
--to=dvhart@infradead.org \
--cc=andy.shevchenko@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michaelsh@mellanox.com \
--cc=sfr@canb.auug.org.au \
--cc=vadimp@mellanox.com \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.