Re: regulator branch mess

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

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