Fwd: Re: [GIT PULL] PCI changes for v5.12

Fwd: Re: [GIT PULL] PCI changes for v5.12

[wuzhouhui]

I'm confused about what the Linus said. It seemed that the branch cannot
be rebased after merged into linux-next under normal circumstances, why?

Linus found this issue by check commit time of commits, but I also found so
many commit in mainline are too young to be merged into linux-next before
merge to mainline. If the rebase is not recommended, why people like to
do rebase after commits are merged into linux-next?

Thanks


-------- Forwarded Message --------
Subject: 	Re: [GIT PULL] PCI changes for v5.12
Date: 	Wed, 24 Feb 2021 11:21:44 -0800
From: 	Linus Torvalds <torvalds@linux-foundation.org>
To: 	Bjorn Helgaas <helgaas@kernel.org>
CC: 	Linux PCI <linux-pci@vger.kernel.org>, Linux Kernel Mailing List 
<linux-kernel@vger.kernel.org>, Lorenzo Pieralisi 
<lorenzo.pieralisi@arm.com>



On Wed, Feb 24, 2021 at 11:03 AM Bjorn Helgaas <helgaas@kernel.org> wrote:
>    git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v5.12-changes

I pulled this, but I'm now unpulling it again.

Why are many of those commits only two hours old, and most of the rest
is from yesterday?

Has any of this been in linux-next?

And if it has, then why was it rebased, and why didn't you explain
*why* it was rebased if so?

I'm willing to pull this if it turns out it _has_ been in linux-next,
but I need explanations.

Linus


_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

Re: Fwd: Re: [GIT PULL] PCI changes for v5.12

[Greg KH]

On Fri, Feb 26, 2021 at 12:54:16PM +0800, wuzhouhui wrote:
> I'm confused about what the Linus said. It seemed that the branch cannot
> be rebased after merged into linux-next under normal circumstances, why?

You should never rebase a public-facing branch.

> Linus found this issue by check commit time of commits, but I also found so
> many commit in mainline are too young to be merged into linux-next before
> merge to mainline. If the rebase is not recommended, why people like to
> do rebase after commits are merged into linux-next?

What commits have you found, and are you sure those are not just merged
through email submissions to Linus instead of a git tree pull?  Please
note that some subsystems still use email, like Andrew Morton's.

As for why people like to rebase, I do not know, you will have to ask
them why they like to do bad things :)

does this help?

greg k-h

_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

Re: Fwd: Re: [GIT PULL] PCI changes for v5.12

[wuzhouhui]

On 2/26/21 3:07 PM, Greg KH wrote:
> On Fri, Feb 26, 2021 at 12:54:16PM +0800, wuzhouhui wrote:
>> I'm confused about what the Linus said. It seemed that the branch cannot
>> be rebased after merged into linux-next under normal circumstances, why?
> You should never rebase a public-facing branch.
>
>> Linus found this issue by check commit time of commits, but I also found so
>> many commit in mainline are too young to be merged into linux-next before
>> merge to mainline. If the rebase is not recommended, why people like to
>> do rebase after commits are merged into linux-next?
> What commits have you found, and are you sure those are not just merged
> through email submissions to Linus instead of a git tree pull?  Please
> note that some subsystems still use email, like Andrew Morton's.
Following commit log are copied from mainline

14 hours    Merge tag 'pwm/for-5.12-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git...HEADmaster    Linus 
Torvalds    7    -374/+65
14 hours    Merge tag 'for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost    Linus 
Torvalds    22    -507/+1492
14 hours    Merge tag 'mips_5.12_1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mips...    Linus 
Torvalds    8    -5/+190
14 hours    Merge tag 'drm-next-2021-02-26' of 
git://anongit.freedesktop.org/drm/drm    Linus Torvalds    68 -423/+1223
14 hours    Merge tag 'net-5.12-rc1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/net...    Linus 
Torvalds    68    -371/+734
14 hours    Merge tag 'acpi-5.12-rc1-3' of 
git://git.kernel.org/pub/scm/linux/kernel/git/...    Linus Torvalds    
8    -27/+334
15 hours    Merge tag 'drm-intel-next-fixes-2021-02-25' of 
git://anongit.freedesktop.org/...    Dave Airlie    7    -94/+65
15 hours    Merge tag 'amd-drm-fixes-5.12-2021-02-24' of 
https://gitlab.freedesktop.org/a...    Dave Airlie    11    -48/+158
15 hours    Merge tag 'drm-misc-next-fixes-2021-02-25' of 
git://anongit.freedesktop.org/d...    Dave Airlie    14    -62/+197
16 hours    Merge tag 'kbuild-v5.12' of 
git://git.kernel.org/pub/scm/linux/kernel/git/mas...    Linus 
Torvalds    65    -498/+698
16 hours    Merge tag 'ext4_for_linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/t...    Linus Torvalds    
6    -49/+59
16 hours    Merge branch 'acpi-tables'    Rafael J. Wysocki    4 -0/+316
16 hours    Merge tag 'pci-v5.12-changes' of 
git://git.kernel.org/pub/scm/linux/kernel/gi...    Linus Torvalds 73    
-781/+5543
16 hours    r8169: fix jumbo packet handling on RTL8168e    Heiner 
Kallweit    1    -2/+2
16 hours    net: phy: micrel: set soft_reset callback to 
genphy_soft_reset for KSZ8081    Christian Melki    1    -0/+1
16 hours    Merge tag 'nds32-for-linux-5.12' of 
git://git.kernel.org/pub/scm/linux/kernel...    Linus Torvalds 4    -50/+5
16 hours    net: psample: Fix netlink skb length with tunnel info Chris 
Mi    1    -2/+2
16 hours    net: broadcom: bcm4908_enet: fix NAPI poll returned value    
Rafał Miłecki    1    -0/+2
16 hours    net: broadcom: bcm4908_enet: fix RX path possible mem 
leak    Rafał Miłecki    1    -0/+1

We can see that, last non-merge commit is just 2 hours older than 
merge-commits committed
by Linus, so these non-merge commits shouldn't contained in linux-next 
before merge into
mainline. Does me  misunderstand something?

Thanks
>
> As for why people like to rebase, I do not know, you will have to ask
> them why they like to do bad things :)
>
> does this help?
>
> greg k-h
>
> _______________________________________________
> Kernelnewbies mailing list
> Kernelnewbies@kernelnewbies.org
> https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies


_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies

Re: Fwd: Re: [GIT PULL] PCI changes for v5.12

[Greg KH]

On Fri, Feb 26, 2021 at 06:02:07PM +0800, wuzhouhui wrote:
> On 2/26/21 3:07 PM, Greg KH wrote:
> > On Fri, Feb 26, 2021 at 12:54:16PM +0800, wuzhouhui wrote:
> > > I'm confused about what the Linus said. It seemed that the branch cannot
> > > be rebased after merged into linux-next under normal circumstances, why?
> > You should never rebase a public-facing branch.
> > 
> > > Linus found this issue by check commit time of commits, but I also found so
> > > many commit in mainline are too young to be merged into linux-next before
> > > merge to mainline. If the rebase is not recommended, why people like to
> > > do rebase after commits are merged into linux-next?
> > What commits have you found, and are you sure those are not just merged
> > through email submissions to Linus instead of a git tree pull?  Please
> > note that some subsystems still use email, like Andrew Morton's.
> Following commit log are copied from mainline
> 
> 14 hours    Merge tag 'pwm/for-5.12-rc1' of
> git://git.kernel.org/pub/scm/linux/kernel/git...HEADmaster    Linus
> Torvalds    7    -374/+65
> 14 hours    Merge tag 'for_linus' of
> git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost    Linus Torvalds   
> 22    -507/+1492
> 14 hours    Merge tag 'mips_5.12_1' of
> git://git.kernel.org/pub/scm/linux/kernel/git/mips...    Linus Torvalds   
> 8    -5/+190
> 14 hours    Merge tag 'drm-next-2021-02-26' of
> git://anongit.freedesktop.org/drm/drm    Linus Torvalds    68 -423/+1223
> 14 hours    Merge tag 'net-5.12-rc1' of
> git://git.kernel.org/pub/scm/linux/kernel/git/net...    Linus Torvalds   
> 68    -371/+734
> 14 hours    Merge tag 'acpi-5.12-rc1-3' of
> git://git.kernel.org/pub/scm/linux/kernel/git/...    Linus Torvalds    8   
> -27/+334


Take a look at these and think about why they couldn't be in linux-next
beforehand :)

You might want to look at non-merge commits...

> 16 hours    net: phy: micrel: set soft_reset callback to genphy_soft_reset
> for KSZ8081    Christian Melki    1    -0/+1
> 16 hours    Merge tag 'nds32-for-linux-5.12' of
> git://git.kernel.org/pub/scm/linux/kernel...    Linus Torvalds 4    -50/+5
> 16 hours    net: psample: Fix netlink skb length with tunnel info Chris
> Mi    1    -2/+2
> 16 hours    net: broadcom: bcm4908_enet: fix NAPI poll returned value   
> Rafał Miłecki    1    -0/+2
> 16 hours    net: broadcom: bcm4908_enet: fix RX path possible mem leak   
> Rafał Miłecki    1    -0/+1
> 
> We can see that, last non-merge commit is just 2 hours older than
> merge-commits committed
> by Linus, so these non-merge commits shouldn't contained in linux-next
> before merge into
> mainline. Does me  misunderstand something?

For bugfixes, yes, they can be accepted now for "high volume" subsystems
like networking.  You don't want those to be delayed, especially when
they are found to be fixes in the previous pull request for that
subsystem, right?

But what we do not want is a bunch of "quick, let's rebase our patches
on Linus's latest tree!" for normal commits as then we have no idea if
they really were tested out in linux-next or not.

thanks,

greg k-h

_______________________________________________
Kernelnewbies mailing list
Kernelnewbies@kernelnewbies.org
https://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies