Re: Applied "mfd: tps65218: add version check to the PMIC probe" to the regulator tree

[Mark Brown]

On Wed, Aug 31, 2016 at 09:31:14AM +0100, Lee Jones wrote:
> On Wed, 10 Aug 2016, Mark Brown wrote:

> > The patch

> >    mfd: tps65218: add version check to the PMIC probe

> Why did you take this patch?

You acked it, that's saying that you're OK with the patch and are
expecting someone else to apply it.

> I now have a merge conflict.

> Did you provide a pull-request that I can use to resolve?

The following changes since commit 29b4817d4018df78086157ea3a55c1d9424a7cfc:

  Linux 4.8-rc1 (2016-08-07 18:18:00 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git tags/tps65218-ver-check

for you to fetch changes up to f11fa1796a4b4f8c6d4ced37e8824276ec57057d:

  mfd: tps65218: add version check to the PMIC probe (2016-08-10 18:21:55 +0100)

----------------------------------------------------------------
mfd: tps65218: Add hardware version check

This will be used for quirks by some function drivers.

----------------------------------------------------------------
Tero Kristo (1):
      mfd: tps65218: add version check to the PMIC probe

 drivers/mfd/tps65218.c       | 9 +++++++++
 include/linux/mfd/tps65218.h | 1 +
 2 files changed, 10 insertions(+)

Attachment: signature.asc
Description: PGP signature