regulator branch mess

regulator branch mess

[Andy Shevchenko]

Hi, Mark.

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.

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/ci.git/commit/?h=regulator-6.19

-- 
With Best Regards,
Andy Shevchenko

Re: regulator branch mess

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 736 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: regulator branch mess

[Andy Shevchenko]

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



-- 
With Best Regards,
Andy Shevchenko

Re: regulator branch mess

[Andy Shevchenko]

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

Re: regulator branch mess

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 360 bytes --]

On Tue, Nov 04, 2025 at 05:48:28PM +0200, Andy Shevchenko wrote:
> On Tue, Nov 04, 2025 at 03:32:59PM +0000, Mark Brown wrote:

> > 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:

You are not describing a concrete problem here.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: regulator branch mess

[Andy Shevchenko]

On Tue, Nov 04, 2025 at 04:01:57PM +0000, Mark Brown wrote:
> On Tue, Nov 04, 2025 at 05:48:28PM +0200, Andy Shevchenko wrote:
> > On Tue, Nov 04, 2025 at 03:32:59PM +0000, Mark Brown wrote:
> 
> > > 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:
> 
> You are not describing a concrete problem here.

The merge in your regulator tree for-6.19 branch which is

  commit 9de2057bbdfb58f4d9bb1476135317cd3fe6aa52 (patch)
  tree 97c34e939fd59891ab122d191ebbe8837a0010d3

  regulator: pf9453: optimize PMIC PF9453 driver

contains tons of unrelated (as far as I understood the intention of _this_
merge) stuff in it.

OR

it doesn't describe the _need_ to have all that to be merged for the series
that is less than two dozens of lines changed.

-- 
With Best Regards,
Andy Shevchenko

Re: regulator branch mess

[Andy Shevchenko]

On Tue, Nov 04, 2025 at 06:11:09PM +0200, Andy Shevchenko wrote:
> On Tue, Nov 04, 2025 at 04:01:57PM +0000, Mark Brown wrote:
> > On Tue, Nov 04, 2025 at 05:48:28PM +0200, Andy Shevchenko wrote:
> > > On Tue, Nov 04, 2025 at 03:32:59PM +0000, Mark Brown wrote:
> > 
> > > > 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:
> > 
> > You are not describing a concrete problem here.
> 
> The merge in your regulator tree for-6.19 branch which is
> 
>   commit 9de2057bbdfb58f4d9bb1476135317cd3fe6aa52 (patch)
>   tree 97c34e939fd59891ab122d191ebbe8837a0010d3
> 
>   regulator: pf9453: optimize PMIC PF9453 driver
> 
> contains tons of unrelated (as far as I understood the intention of _this_
> merge) stuff in it.
> 
> OR
> 
> it doesn't describe the _need_ to have all that to be merged for the series
> that is less than two dozens of lines changed.

Because "base" keyword in the series points out to the 

  commit 98bd8b16ae57e8f25c95d496fcde3dfdd8223d41 (tag: next-20251031)
	Author: Stephen Rothwell <sfr@canb.auug.org.au>
	Date:   Fri Oct 31 20:35:57 2025 +1100

  Add linux-next specific files for 20251031

  Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>


And that merge did it. If you are going to send this to Linus, I believe it
will become a trouble.

-- 
With Best Regards,
Andy Shevchenko

Re: regulator branch mess

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1957 bytes --]

On Tue, Nov 04, 2025 at 06:18:28PM +0200, Andy Shevchenko wrote:
> On Tue, Nov 04, 2025 at 06:11:09PM +0200, Andy Shevchenko wrote:

> > The merge in your regulator tree for-6.19 branch which is

> >   commit 9de2057bbdfb58f4d9bb1476135317cd3fe6aa52 (patch)
> >   tree 97c34e939fd59891ab122d191ebbe8837a0010d3
> > 
> >   regulator: pf9453: optimize PMIC PF9453 driver

> Because "base" keyword in the series points out to the 

>   commit 98bd8b16ae57e8f25c95d496fcde3dfdd8223d41 (tag: next-20251031)
> 	Author: Stephen Rothwell <sfr@canb.auug.org.au>
> 	Date:   Fri Oct 31 20:35:57 2025 +1100
> 
>   Add linux-next specific files for 20251031
> 
>   Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

> And that merge did it. If you are going to send this to Linus, I believe it
> will become a trouble.

No, that merge very much did not do that.  As you can tell with git log
and from the diffstat I posted previously that linux-next commit does
not appear in the history of the above commit.  You can also see this
with git cherry:

$ git cherry origin/master regulator/for-6.19
+ 6277a486a7faaa6c87f4bf1d59a2de233a093248
+ 433e294c3c5b5d2020085a0e36c1cb47b694690a
+ 835dfb12fc389f36eb007657f163bd1c539dcd45
+ 1356c98ef911e14ccfaf374800840ce5bdcb3bbd
+ 6a8cdef7dc2a4c0dbde3f7d7100b3d99712a766b
+ 65efe5404d151767653c7b7dd39bd2e7ad532c2d
+ fb25114cd760c13cf177d9ac37837fafcc9657b5
+ f76dbe127f1b5910e37dfe307d2de5c13d61ed89
+ d054cc3a2ccfb19484f3b54d69b6e416832dc8f4
+ 01313661b248c5ba586acae09bff57077dbec0a5
+ 86df0030b71d7172317d957df17524a7fd6232d4
+ 4c33cef58965eb655a0ac8e243aa323581ec025f
+ 28039efa4d8e8bbf98b066133a906bd4e307d496
+ 252abf2d07d33b1c70a59ba1c9395ba42bbd793e
+ a2d4691b3fec6a2360e4ec953d06819ea055c3e7
+ 0144a2b29d95af8523c308116de65d398d6e935b
+ 2ecc8c089802e033d2e5204d21a9f467e2517df9

That is the full list of commits in the for-6.19 that do not already
appear in mainline.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: regulator branch mess

[Andy Shevchenko]

On Tue, Nov 04, 2025 at 04:30:54PM +0000, Mark Brown wrote:
> On Tue, Nov 04, 2025 at 06:18:28PM +0200, Andy Shevchenko wrote:
> > On Tue, Nov 04, 2025 at 06:11:09PM +0200, Andy Shevchenko wrote:
> 
> > > The merge in your regulator tree for-6.19 branch which is
> 
> > >   commit 9de2057bbdfb58f4d9bb1476135317cd3fe6aa52 (patch)
> > >   tree 97c34e939fd59891ab122d191ebbe8837a0010d3
> > > 
> > >   regulator: pf9453: optimize PMIC PF9453 driver
> 
> > Because "base" keyword in the series points out to the 
> 
> >   commit 98bd8b16ae57e8f25c95d496fcde3dfdd8223d41 (tag: next-20251031)
> > 	Author: Stephen Rothwell <sfr@canb.auug.org.au>
> > 	Date:   Fri Oct 31 20:35:57 2025 +1100
> > 
> >   Add linux-next specific files for 20251031
> > 
> >   Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> > And that merge did it. If you are going to send this to Linus, I believe it
> > will become a trouble.
> 
> No, that merge very much did not do that.  As you can tell with git log
> and from the diffstat I posted previously that linux-next commit does
> not appear in the history of the above commit.  You can also see this
> with git cherry:
> 
> $ git cherry origin/master regulator/for-6.19
> + 6277a486a7faaa6c87f4bf1d59a2de233a093248
> + 433e294c3c5b5d2020085a0e36c1cb47b694690a
> + 835dfb12fc389f36eb007657f163bd1c539dcd45
> + 1356c98ef911e14ccfaf374800840ce5bdcb3bbd
> + 6a8cdef7dc2a4c0dbde3f7d7100b3d99712a766b
> + 65efe5404d151767653c7b7dd39bd2e7ad532c2d
> + fb25114cd760c13cf177d9ac37837fafcc9657b5
> + f76dbe127f1b5910e37dfe307d2de5c13d61ed89
> + d054cc3a2ccfb19484f3b54d69b6e416832dc8f4
> + 01313661b248c5ba586acae09bff57077dbec0a5
> + 86df0030b71d7172317d957df17524a7fd6232d4
> + 4c33cef58965eb655a0ac8e243aa323581ec025f
> + 28039efa4d8e8bbf98b066133a906bd4e307d496
> + 252abf2d07d33b1c70a59ba1c9395ba42bbd793e
> + a2d4691b3fec6a2360e4ec953d06819ea055c3e7
> + 0144a2b29d95af8523c308116de65d398d6e935b
> + 2ecc8c089802e033d2e5204d21a9f467e2517df9
> 
> That is the full list of commits in the for-6.19 that do not already
> appear in mainline.

Yes, because this merge brings also rc3-rc4 bump:

$ git merge-base origin/master reg/for-6.19
6146a0f1dfae5d37442a9ddcba012add260bceb0

$ git describe 6146a0f1dfae5d37442a9ddcba012add260bceb0
v6.18-rc4

$ git merge-base origin/master reg/for-6.19^
dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa

$ git describe dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa
v6.18-rc3

Now I see the source of those 3kLoCs in the merge commit on GitWeb.

$ git diff --stat v6.18-rc3..v6.18-rc4
...
252 files changed, 2022 insertions(+), 854 deletions(-)

+ the changes on top that you mentioned above.

-- 
With Best Regards,
Andy Shevchenko

Re: regulator branch mess

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 293 bytes --]

On Tue, Nov 04, 2025 at 06:54:51PM +0200, Andy Shevchenko wrote:
> On Tue, Nov 04, 2025 at 04:30:54PM +0000, Mark Brown wrote:

> > That is the full list of commits in the for-6.19 that do not already
> > appear in mainline.

> Yes, because this merge brings also rc3-rc4 bump:

Yes, it does.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: regulator branch mess

[Andy Shevchenko]

On Tue, Nov 04, 2025 at 05:05:19PM +0000, Mark Brown wrote:
> On Tue, Nov 04, 2025 at 06:54:51PM +0200, Andy Shevchenko wrote:
> > On Tue, Nov 04, 2025 at 04:30:54PM +0000, Mark Brown wrote:
> 
> > > That is the full list of commits in the for-6.19 that do not already
> > > appear in mainline.
> 
> > Yes, because this merge brings also rc3-rc4 bump:
> 
> Yes, it does.

Thanks for patience and helping me to understand this. So, if it's all
expected, I have no problem with :-)

-- 
With Best Regards,
Andy Shevchenko

Re: regulator branch mess

[Theodore Ts'o]

Andy, I don't know what github is doing to confuse you, but my
preferred way of understanding what is in a merge commit is to use the
command line tools, which are less likely to lie (or at least, to be
confusing):

% git log --pretty=oneline regulator/for-next ^base/master
9de2057bbdfb58f4d9bb1476135317cd3fe6aa52 (regulator/for-next, regulator/for-6.19, regulator/HEAD) regulator: pf9453: optimize PMIC PF9453 driver
2ecc8c089802e033d2e5204d21a9f467e2517df9 regulator: pf9453: remove unused I2C_LT register
0144a2b29d95af8523c308116de65d398d6e935b regulator: pf9453: remove low power mode
a2d4691b3fec6a2360e4ec953d06819ea055c3e7 regulator: pf9453: change the device ID register address
252abf2d07d33b1c70a59ba1c9395ba42bbd793e regulator: Small cleanup in of_get_regulation_constraints()
28039efa4d8e8bbf98b066133a906bd4e307d496 MAINTAINERS: remove obsolete file entry in DIALOG SEMICONDUCTOR DRIVERS
dc74a00c7661a14a672ea7660caca5c4aa661a79 regulator: pca9450: add input supply links
4c33cef58965eb655a0ac8e243aa323581ec025f regulator: pca9450: link regulator inputs to supply groups
86df0030b71d7172317d957df17524a7fd6232d4 regulator: dt-bindings: nxp,pca9450: document input supplies
01313661b248c5ba586acae09bff57077dbec0a5 regulator: Let raspberrypi drivers depend on ARM
d054cc3a2ccfb19484f3b54d69b6e416832dc8f4 regulator: rpmh-regulator: Add RPMH regulator support for PMR735D
f76dbe127f1b5910e37dfe307d2de5c13d61ed89 regulator: dt-bindings: qcom,rpmh: Add support for PMR735D
5263cd81578f99a00b2dd7de1da2b570b96a1b7c rpmh-regulators: Update rpmh-regulator driver and
fb25114cd760c13cf177d9ac37837fafcc9657b5 regulator: sy7636a: add gpios and input regulator
65efe5404d151767653c7b7dd39bd2e7ad532c2d regulator: rpmh-regulator: Add RPMH regulator support for Glymur
6a8cdef7dc2a4c0dbde3f7d7100b3d99712a766b regulator: rpmh-regulator: Add support for new resource name format
1356c98ef911e14ccfaf374800840ce5bdcb3bbd regulator: dt-bindings: rpmh-regulator: Update pmic-id DT prop info for new CMD-DB
835dfb12fc389f36eb007657f163bd1c539dcd45 regulator: dt-bindings: rpmh-regulator : Add compatibles for PMH01XX & PMCX0102
433e294c3c5b5d2020085a0e36c1cb47b694690a regulator: core: forward undervoltage events downstream by default
6277a486a7faaa6c87f4bf1d59a2de233a093248 regulator: dt-bindings: Convert Dialog DA9211 Regulators to DT schema

% git log -1 base/master
commit c9cfc122f03711a5124b4aafab3211cf4d35a2ac (base/master, base/HEAD)
Merge: 8bb886cb8f3a 3b1a4a59a208
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Nov 4 14:25:38 2025 +0900

    Merge tag 'for-6.18-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
    
    Pull btrfs fixes from David Sterba:
    
     - fix memory leak in qgroup relation ioctl when qgroup levels are
       invalid
    
     - don't write back dirty metadata on filesystem with errors
    
     - properly log renamed links
    
     - properly mark prealloc extent range beyond inode size as dirty (when
       no-noles is not enabled)
    
    * tag 'for-6.18-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
      btrfs: mark dirty extent range for out of bound prealloc extents
      btrfs: set inode flag BTRFS_INODE_COPY_EVERYTHING when logging new name
      btrfs: fix memory leak of qgroup_list in btrfs_add_qgroup_relation
      btrfs: ensure no dirty metadata is written back for an fs with errors

Cheers,

						- Ted

Re: regulator branch mess

[Andy Shevchenko]

On Tue, Nov 04, 2025 at 05:15:51PM -0500, Theodore Ts'o wrote:
> Andy, I don't know what github is doing to confuse you, but my

I haven't told anything about Git Hub, I talked about web representation on
kernel.org.

> preferred way of understanding what is in a merge commit is to use the
> command line tools, which are less likely to lie (or at least, to be
> confusing):

Yep, less confusing. The problem of the confusion here is the merge commit
text, that only describes the merge of the small series but also implies bump
from v6.18-rc3 to v6.18-rc4. Other subsystems I follow usually do an explicit
back-merges to the rcX whenever is needed. But as I told Mark, I'm fine if
that was a deliberate (known) move. Now it's all clear.

Thanks for helping me to understand this!

> % git log --pretty=oneline regulator/for-next ^base/master
> 9de2057bbdfb58f4d9bb1476135317cd3fe6aa52 (regulator/for-next, regulator/for-6.19, regulator/HEAD) regulator: pf9453: optimize PMIC PF9453 driver
> 2ecc8c089802e033d2e5204d21a9f467e2517df9 regulator: pf9453: remove unused I2C_LT register
> 0144a2b29d95af8523c308116de65d398d6e935b regulator: pf9453: remove low power mode
> a2d4691b3fec6a2360e4ec953d06819ea055c3e7 regulator: pf9453: change the device ID register address
> 252abf2d07d33b1c70a59ba1c9395ba42bbd793e regulator: Small cleanup in of_get_regulation_constraints()
> 28039efa4d8e8bbf98b066133a906bd4e307d496 MAINTAINERS: remove obsolete file entry in DIALOG SEMICONDUCTOR DRIVERS
> dc74a00c7661a14a672ea7660caca5c4aa661a79 regulator: pca9450: add input supply links
> 4c33cef58965eb655a0ac8e243aa323581ec025f regulator: pca9450: link regulator inputs to supply groups
> 86df0030b71d7172317d957df17524a7fd6232d4 regulator: dt-bindings: nxp,pca9450: document input supplies
> 01313661b248c5ba586acae09bff57077dbec0a5 regulator: Let raspberrypi drivers depend on ARM
> d054cc3a2ccfb19484f3b54d69b6e416832dc8f4 regulator: rpmh-regulator: Add RPMH regulator support for PMR735D
> f76dbe127f1b5910e37dfe307d2de5c13d61ed89 regulator: dt-bindings: qcom,rpmh: Add support for PMR735D
> 5263cd81578f99a00b2dd7de1da2b570b96a1b7c rpmh-regulators: Update rpmh-regulator driver and
> fb25114cd760c13cf177d9ac37837fafcc9657b5 regulator: sy7636a: add gpios and input regulator
> 65efe5404d151767653c7b7dd39bd2e7ad532c2d regulator: rpmh-regulator: Add RPMH regulator support for Glymur
> 6a8cdef7dc2a4c0dbde3f7d7100b3d99712a766b regulator: rpmh-regulator: Add support for new resource name format
> 1356c98ef911e14ccfaf374800840ce5bdcb3bbd regulator: dt-bindings: rpmh-regulator: Update pmic-id DT prop info for new CMD-DB
> 835dfb12fc389f36eb007657f163bd1c539dcd45 regulator: dt-bindings: rpmh-regulator : Add compatibles for PMH01XX & PMCX0102
> 433e294c3c5b5d2020085a0e36c1cb47b694690a regulator: core: forward undervoltage events downstream by default
> 6277a486a7faaa6c87f4bf1d59a2de233a093248 regulator: dt-bindings: Convert Dialog DA9211 Regulators to DT schema

-- 
With Best Regards,
Andy Shevchenko

Re: regulator branch mess

[Theodore Ts'o]

On Wed, Nov 05, 2025 at 07:24:50AM +0200, Andy Shevchenko wrote:
> Yep, less confusing. The problem of the confusion here is the merge commit
> text, that only describes the merge of the small series but also implies bump
> from v6.18-rc3 to v6.18-rc4. Other subsystems I follow usually do an explicit
> back-merges to the rcX whenever is needed. But as I told Mark, I'm fine if
> that was a deliberate (known) move. Now it's all clear.

So what I do is I have an "origin" branch which shows the base on
which my dev series is based.  I use a rewinding workflow where I do
regularly do rebases to add Fixes: and Reviewed-by: tags, et. al.
There will be times when an upstream bugfix in some other file system
(say, vfs and mm) is affecting my testing, so I'll do a fast-forward
of my origin branch to the next rcX, and then do a rebase of my dev
branch on the new dev branch.

If there's a bug that I find before I send a pull request to Linus,
I'll fold the fix into the buggy commit, which can also avoid
potential problems when people are bisecting Linus's tree.

Since one of the goals of my using a rewinding/rebasing workflow is to
keep the dev branch clear, I consider back merges to be noise that
future kernel developers would not appreciate being permanently
preserved in Linus's tree.

I know there are some people who believe that git history should be
immutable, and should never, ever be rewound.  It's a tradeoff, and
different maintainers will use different workflows.

Cheers,

						- Ted