[PATCH linux dev-6.6 1/2] hwmon: Add driver for MPS MPQ8785 Synchronous Step-Down Converter

[Andrew Jeffery]

On Fri, 2025-08-08 at 15:28 +0800, Fred Chen wrote:
> Andrew Jeffery <andrew at codeconstruct.com.au> 於 2025年8月8日 週五 上午10:35寫道：
> > 
> > On Wed, 2025-08-06 at 20:12 +0800, Fred Chen wrote:
> > > From: Charles Hsu <ythsu0511 at gmail.com>
> > > 
> > > Add support for mpq8785 device from Monolithic Power Systems, Inc.
> > > (MPS) vendor. This is synchronous step-down controller.
> > > 
> > > Signed-off-by: Charles Hsu <ythsu0511 at gmail.com>
> > > Link: https://lore.kernel.org/r/20240131074822.2962078-2-ythsu0511@gmail.com
> > > [groeck: probe_new --> probe; add MODULE_IMPORT_NS(PMBUS)]
> > > Signed-off-by: Guenter Roeck <linux at roeck-us.net>
> > > (cherry picked from commit f20b4a931130cb574c40563cfda0fc2cb944b4df)
> > 
> > I'm not sure what you did here with the backported patches, because
> > trying to apply this series from the list lead to conflicts. However,
> > on the basis that there was no discussion of conflicts, I cherry-picked
> > back the changes as indicated by the commit IDs, which applied
> > successfully (though with auto-merge results).
> > 
> > Possibly it's differences in the tooling for patches vs existing
> > commits, but some discussion of your experiences would be helpful.
> > 
> > Did you try to apply your own series before sending it to the list?
> > 
> > Andrew
> 
> Hi Andrew,
> 
> Thanks for pointing this out.
> 
> I realized I was using the wrong Linux 6.6 tree when testing — I used
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
> (branch: linux-6.6.y) instead of the OpenBMC Linux kernel. That tree’s
> index.rst doesn’t include mp5990, which caused the conflict. I’ll use
> the OpenBMC Linux kernel for patch preparation next time to avoid this
> issue.
> 

Thanks for taking the time to understand what happened.

Andrew