From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Lee Jones <lee.jones@linaro.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sinan Kaya <okaya@kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Subject: Re: linux-next: manual merge of the mfd tree with Linus' tree
Date: Fri, 8 Feb 2019 10:33:01 +0200 [thread overview]
Message-ID: <e5610b74-043e-07e0-c024-4513f964e8ae@linux.intel.com> (raw)
In-Reply-To: <20190208133737.7e754345@canb.auug.org.au>
On 2/8/19 4:37 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> drivers/mfd/Kconfig
>
> between commit:
>
> 9baddb61dfec ("mfd: Fix unmet dependency warning for MFD_TPS68470")
>
> from Linus' tree and commit:
>
> 09fdc9857712 ("mfd: Kconfig: Fix I2C_DESIGNWARE_PLATFORM dependencies")
>
> from the mfd 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, that's is the right fix for the conflict.
--
Jarkko
next prev parent reply other threads:[~2019-02-08 8:33 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-08 2:37 linux-next: manual merge of the mfd tree with Linus' tree Stephen Rothwell
2019-02-08 8:33 ` Jarkko Nikula [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-05 22:49 Stephen Rothwell
2019-06-11 4:31 Stephen Rothwell
2019-05-09 2:44 Stephen Rothwell
2018-08-17 0:39 Stephen Rothwell
2018-08-21 8:08 ` Geert Uytterhoeven
2018-08-21 8:30 ` Stephen Rothwell
2018-08-28 13:34 ` Geert Uytterhoeven
2018-08-28 21:45 ` Stephen Rothwell
2018-03-08 1:33 Stephen Rothwell
2018-03-08 8:12 ` Lee Jones
2014-11-13 1:47 Stephen Rothwell
2012-11-28 3:20 Stephen Rothwell
2012-10-03 4:12 Stephen Rothwell
2012-09-18 3:19 Stephen Rothwell
2012-09-18 7:31 ` Dong Aisheng
2012-09-12 2:49 Stephen Rothwell
2012-07-25 1:18 Stephen Rothwell
2012-07-25 6:40 ` Laxman Dewangan
2012-05-23 3:01 Stephen Rothwell
2012-05-22 4:14 Stephen Rothwell
2012-05-22 4:10 Stephen Rothwell
2012-03-23 3:32 Stephen Rothwell
2012-03-23 9:41 ` Samuel Ortiz
2012-03-24 17:31 ` Grant Likely
2012-03-26 8:25 ` Samuel Ortiz
2012-03-28 22:47 ` Grant Likely
2012-01-12 1:06 Stephen Rothwell
2011-09-09 4:22 Stephen Rothwell
2011-03-21 1:26 Stephen Rothwell
2011-03-21 8:21 ` Linus Walleij
2011-03-22 11:16 ` Samuel Ortiz
2011-03-23 17:57 ` Linus Walleij
2011-03-22 11:08 ` Samuel Ortiz
2010-09-13 1:54 Stephen Rothwell
2010-09-13 13:59 ` Samuel Ortiz
2010-08-12 4:41 Stephen Rothwell
2010-08-12 9:51 ` Samuel Ortiz
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=e5610b74-043e-07e0-c024-4513f964e8ae@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=okaya@kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=sfr@canb.auug.org.au \
/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.