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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 31 Aug 2016 12:41:05 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Lee Jones <lee.jones@...aro.org>
Cc:     Tero Kristo <t-kristo@...com>, Dave Gerlach <d-gerlach@...com>,
        Keerthy <j-keerthy@...com>, tony@...mide.com,
        devicetree@...r.kernel.org, linux-omap@...r.kernel.org,
        linux-kernel@...r.kernel.org, russ.dill@...com, robh+dt@...nel.org,
        mark.rutland@....com, linux@...linux.org.uk
Subject: Re: Applied "mfd: tps65218: add version check to the PMIC probe" to
 the regulator tree

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(+)

Download attachment "signature.asc" of type "application/pgp-signature" (456 bytes)