From: Lee Jones <lee.jones@linaro•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Matti Vaittinen <matti.vaittinen@fi•rohmeurope.com>,
Axel Lin <axel.lin@ingics•com>
Subject: Re: linux-next: manual merge of the mfd tree with the regulator-fixes tree
Date: Tue, 28 Jan 2020 07:39:01 +0000 [thread overview]
Message-ID: <20200128073901.GB3548@dell> (raw)
In-Reply-To: <20200128120220.53494c29@canb.auug.org.au>
On Tue, 28 Jan 2020, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> drivers/regulator/bd718x7-regulator.c
>
> between commit:
>
> b389ceae4a8f ("regulator: bd718x7: Simplify the code by removing struct bd718xx_pmic_inits")
>
> from the regulator-fixes tree and commit:
>
> 1b1c26b24a6e ("mfd: Rohm PMICs: Use platform_device_id to match MFD sub-devices")
>
> 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.
A pull-request was sent out to avoid this.
If Mark pulls it, this should just go away.
--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2020-01-28 7:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 1:02 linux-next: manual merge of the mfd tree with the regulator-fixes tree Stephen Rothwell
2020-01-28 7:39 ` Lee Jones [this message]
2020-01-28 12:03 ` Mark Brown
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=20200128073901.GB3548@dell \
--to=lee.jones@linaro$(echo .)org \
--cc=axel.lin@ingics$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matti.vaittinen@fi$(echo .)rohmeurope.com \
--cc=sfr@canb$(echo .)auug.org.au \
/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