Re: [PATCH 00/37] nvmem: patches for 6.3

From: Greg KH
Date: Mon Feb 06 2023 - 02:46:08 EST


On Mon, Jan 30, 2023 at 03:54:58PM +0000, Srinivas Kandagatla wrote:
>
>
> On 30/01/2023 11:59, Greg KH wrote:
> > On Mon, Jan 30, 2023 at 11:27:06AM +0000, Srinivas Kandagatla wrote:
> > >
> > >
> > > On 28/01/2023 13:43, Greg KH wrote:
> > > > On Fri, Jan 27, 2023 at 11:15:28AM +0000, Srinivas Kandagatla wrote:
> > > > > Hi Greg,
> > > > >
> > > > > Here are some nvmem patches bit more than usual for 6.3 which includes
> > > > >
> > > > > - Adding support for nvmem layouts, thanks to Michael and Miquel for
> > > > > driving this effort.
> > > > > - Add support to stm32 STM32MP15x OPTEE based nvmem provider
> > > > > - Updated to qfprom bindings to include various Qualcomm SoCs.
> > > > > - adding sl28vpd provider layout
> > > > > - move imx provider to use new layout apis
> > > > > - add ONIE provider layout.
> > > > > - new helper eth_addr_add().
> > > > > - few minor enhancements to core and providersdrivers.
> > > > >
> > > > > Can you please queue them up for 6.3.
> > > >
> > > > This series does NOT apply to my char-misc-next branch, which is based
> > > > on 6.2-rc5. What did you generate it against?
> > > >
> > > These were on top of nvmem-fixes based on 6.2-rc1.
> >
> > Ah, always say that please.
> My bad, I assumed that fixes will be applied and then these patches. But I
> should have mentioned this clearly.
>
> >
> > > > Can you rebase it and resend?
> > >
> > > char-misc-next does not have nvmem-fixes yet, which branch should I rebase
> > > these on?
> >
> > char-misc-next please. If there are going to be merge conflicts when
> > the char-misc-linus branch gets merged into that with these changes, > please let me know.
>
> Yes, for sure this is going to conflict. some of the patches in this set are
> on top of fixes.

Ok, now that the char-misc-linus branch is merged into my -next branch,
I've applied these.

thanks,

greg k-h