Re: regulator branch mess

[Andy Shevchenko <andriy.shevchenko@intel.com>]

On Tue, Nov 04, 2025 at 05:48:29PM +0200, Andy Shevchenko wrote:
> On Tue, Nov 04, 2025 at 03:32:59PM +0000, Mark Brown wrote:
> > On Tue, Nov 04, 2025 at 05:20:59PM +0200, Andy Shevchenko wrote:
> > 
> > > Something bad happened to the regulator branch [1].
> > > First of all, the merge message contains unneeded details (at least the
> > > author's email signature). Second, the few lines series becomes 3kLoCs
> > > merge commit. I think the base was wrong and `b4` (if you use that one)
> > > took too much to merge.
> > 
> > I forgot to trim the cover letter but otherwise I really can't see any
> > issues and you're not in the slightest bit specific about what you think
> > is a problem.  The diffstat for the tree is:
> > 
> >  13 files changed, 1149 insertions(+), 780 deletions(-)
> > 
> > which doesn't doesn't correspond to "thousands" of lines.  I really
> > can't tell what on earth you are talking about here.
> 
> I look at it via GitWeb [1] and that's what I see:
> 
> Age	Commit message (Expand)	Author	Files	Lines
> 2 hours	regulator: pf9453: optimize PMIC PF9453 driverHEADfor-nextfor-6.19	Mark Brown	253	-872/+2020
> 26 hours	regulator: pf9453: remove unused I2C_LT register	Joy Zou	1	-7/+0
> 26 hours	regulator: pf9453: remove low power mode	Joy Zou	1	-12/+0
> 26 hours	regulator: pf9453: change the device ID register address	Joy Zou	1	-2/+1
> 27 hours	regulator: Small cleanup in of_get_regulation_constraints()	Dan Carpenter	1	-3/+3
> 44 hours	Linux 6.18-rc4for-linusfor-6.18	Linus Torvalds	1	-1/+1
> ...
> 
> Which suggests the series changes only few lines, but if you click to the last
> merge commit, you will see the heck out of whole tree bound to it. This is
> usually the case when `b4 shazam` guesses the base in a way one doesn't expect
> (it may merge your local branch if it founds match in the series with what you
>  have).
> 
> So, in the merge commit the picture is
> 
> Diffstat
> -rw-r--r--	.mailmap	1	
> -rw-r--r--	CREDITS	4	
> -rw-r--r--	Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml	4	
> -rw-r--r--	Documentation/devicetree/bindings/sound/qcom,pm4125-sdw.yaml	4	
> -rw-r--r--	Documentation/netlink/specs/dpll.yaml	2	
> -rw-r--r--	Documentation/networking/netconsole.rst	3	
> -rw-r--r--	MAINTAINERS	16	
> -rw-r--r--	Makefile	2	
> -rw-r--r--	arch/arm64/net/bpf_jit_comp.c	5	
> -rw-r--r--	arch/s390/Kconfig	1	
> -rw-r--r--	arch/s390/configs/debug_defconfig	14	
> -rw-r--r--	arch/s390/configs/defconfig	14	
> -rw-r--r--	arch/s390/configs/zfcpdump_defconfig	1	
> -rw-r--r--	arch/s390/crypto/phmac_s390.c	52	
> -rw-r--r--	arch/s390/include/asm/pci.h	1	
> -rw-r--r--	arch/s390/mm/dump_pagetables.c	21	
> -rw-r--r--	arch/s390/pci/pci_event.c	4	
> -rw-r--r--	arch/s390/pci/pci_irq.c	9	
> -rw-r--r--	arch/x86/Makefile	2	
> -rw-r--r--	arch/x86/events/intel/core.c	1	
> -rw-r--r--	arch/x86/events/intel/ds.c	3	
> -rw-r--r--	arch/x86/events/intel/uncore.c	1	
> -rw-r--r--	arch/x86/include/asm/intel-family.h	6	
> -rw-r--r--	arch/x86/include/asm/page_64.h	3	
> -rw-r--r--	arch/x86/kernel/cpu/amd.c	12	
> -rw-r--r--	arch/x86/kernel/cpu/microcode/amd.c	20	
> -rw-r--r--	arch/x86/kernel/fpu/core.c	3	
> -rw-r--r--	arch/x86/net/bpf_jit_comp.c	2	
> -rw-r--r--	block/blk-crypto.c	2	
> -rw-r--r--	drivers/acpi/acpi_mrrm.c	3	
> -rw-r--r--	drivers/acpi/acpi_video.c	4	
> -rw-r--r--	drivers/acpi/button.c	4	
> -rw-r--r--	drivers/acpi/fan.h	7	
> -rw-r--r--	drivers/acpi/fan_attr.c	2	
> -rw-r--r--	drivers/acpi/fan_core.c	36	
> -rw-r--r--	drivers/acpi/fan_hwmon.c	11	
> -rw-r--r--	drivers/acpi/spcr.c	2	
> -rw-r--r--	drivers/base/regmap/regmap-slimbus.c	6	
> -rw-r--r--	drivers/bcma/main.c	6	
> -rw-r--r--	drivers/block/null_blk/main.c	1	
> -rw-r--r--	drivers/bluetooth/bpa10x.c	4	
> -rw-r--r--	drivers/bluetooth/btintel_pcie.c	11	
> -rw-r--r--	drivers/bluetooth/btmtksdio.c	12	
> -rw-r--r--	drivers/bluetooth/btmtkuart.c	4	
> -rw-r--r--	drivers/bluetooth/btnxpuart.c	4	
> -rw-r--r--	drivers/bluetooth/hci_ag6xx.c	2	
> -rw-r--r--	drivers/bluetooth/hci_aml.c	2	
> -rw-r--r--	drivers/bluetooth/hci_ath.c	2	
> -rw-r--r--	drivers/bluetooth/hci_bcm.c
> 
> and so on...
> 
> 
> 
> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git/log/?h=for-6.19

Compare to [2] I made in my tree

Age	Commit message (Expand)	Author	Files	Lines
7 hours	Merge patch series "pinctrl: intel: Unify error messages"review-andyfor-next	Andy Shevchenko	5	-64/+35
7 hours	pinctrl: tangier: Unify messages with help of dev_err_probe()	Andy Shevchenko	1	-2/+1
7 hours	pinctrl: lynxpoint: Unify messages with help of dev_err_probe()	Andy Shevchenko	1	-18/+10
7 hours	pinctrl: intel: Unify messages with help of dev_err_probe()	Andy Shevchenko	1	-16/+8
7 hours	pinctrl: cherryview: Unify messages with help of dev_err_probe()	Andy Shevchenko	1	-16/+8
7 hours	pinctrl: baytrail: Unify messages with help of dev_err_probe()	Andy Shevchenko	1	-12/+8
2025-10-12	Linux 6.18-rc1v6.18-rc1fixes	Linus Torvalds	1	-2/+2

* You may already notice that the merge commit statistics correlates by numbers with the series below.

So it's definitely not a problem of GitWeb.

[2]: https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git/log/?h=for-next

-- 
With Best Regards,
Andy Shevchenko