Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 8 Jun 2023 13:42:30 +0100
From:   Lee Jones <lee@kernel.org>
To:     Mark Brown <broonie@kernel.org>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the regulator tree
Message-ID: <20230608124230.GH1930705@google.com>
References: <20230607163743.1c266a7f@canb.auug.org.au>
 <38913e8e-4578-4c4f-a6cd-6f6e628957af@sirena.org.uk>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <38913e8e-4578-4c4f-a6cd-6f6e628957af@sirena.org.uk>
Precedence: bulk

On Wed, 07 Jun 2023, Mark Brown wrote:

> On Wed, Jun 07, 2023 at 04:37:43PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > The following commit is also in the mfd tree as a different commit
> > (but the same patch):
> > 
> >   75c8cb2f4cb2 ("mfd: axp20x: Add support for AXP313a PMIC")
> > 
> > This is commit
> > 
> >   2f518d914bd3 ("mfd: axp20x: Add support for AXP313a PMIC")
> > 
> > in the mfd tree.
> 
> Hrm, that was a tag I pulled from Lee rather than something I applied -
> not sure what's going on there.

Mea culpa.  I hadn't rebased onto my own tag.

Should be fixed in the next -next cut.

-- 
Lee Jones [李琼斯]