linux-next: manual merge of the mfd tree with the regulator-fixes tree
diff mbox series

Message ID 20200128120220.53494c29@canb.auug.org.au
State New
Headers show
Series
  • linux-next: manual merge of the mfd tree with the regulator-fixes tree
Related show

Commit Message

Stephen Rothwell Jan. 28, 2020, 1:02 a.m. UTC
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.

Comments

Lee Jones Jan. 28, 2020, 7:39 a.m. UTC | #1
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.
Mark Brown Jan. 28, 2020, 12:03 p.m. UTC | #2
On Tue, Jan 28, 2020 at 07:39:01AM +0000, Lee Jones wrote:

> A pull-request was sent out to avoid this.

> If Mark pulls it, this should just go away.

I didn't pull it in and Linus already took the regulator changes for
this cycle - I tend to only actually merge the pull requests if there's
any issue so that I minimize the extra bits in my pull requests and this
didn't come up in -next until just now.  Sorry about that, it does look
simple enough though.

Patch
diff mbox series

diff --cc drivers/regulator/bd718x7-regulator.c
index 8f9b2d8eaf10,55decb58c777..000000000000
--- a/drivers/regulator/bd718x7-regulator.c