Messages in this thread | | | From | Linus Torvalds <> | Date | Mon, 25 Oct 2021 11:07:16 -0700 | Subject | Re: Linux 5.15-rc6 |
| |
On Tue, Oct 19, 2021 at 1:33 PM Guenter Roeck <linux@roeck-us.net> wrote: > > Building alpha:allmodconfig ... failed > > drivers/spi/spi-tegra20-slink.c:1197:12: error: 'tegra_slink_runtime_resume' defined but not used [-Werror=unused-function] > 1197 | static int tegra_slink_runtime_resume(struct device *dev)
Ok, I've fixed this up _again_ now in my tree, since I'm about to make another rc and didn't get the fix any other way.
And honestly, I'm a bit upset.
I'm upset because Mark not only screwed up a merge commit, he did so despite the fact that HE SHOULD NOT HAVE DONE A MERGE AT ALL.
Mark, please stop doing these mindless AND INCORRECT back-merges of my tree. There is absolutely no excuse for garbage like this:
commit 59c4e190b10cd2d6edccb5c238a3d2bda071a018 Merge: 6840615f85f6 5816b3e6577e Author: Mark Brown <broonie@kernel.org> Date: Mon Sep 27 18:38
Merge tag 'v5.15-rc3' into spi-5.15
Linux 5.15-rc3
commit ffb1e76f4f32d2b8ea4189df0484980370476395 Merge: 2bab94090b01 e4e737bb5c17 Author: Mark Brown <broonie@kernel.org> Date: Mon Sep 20 15:56
Merge tag 'v5.15-rc2' into spi-5.15
Linux 5.15-rc2
where one of those merges was actively incorrect, and BOTH of the merges were pure crap in that they don't have any explanation for what the reason for the merge was.
I've said this a hundred times before, and I bet I'll have to say it a hundred times again, but let me repeat one more time:
IF YOU CANNOT EXPLAIN WHY YOU ARE DOING A MERGE, THEN DON'T DO THE MERGE.
Dammit, it's really that simple. This is not a complicated rule.
If your merge doesn't have an explanation for what you're doing and *WHY* you are doing it, then your merge is bad, bad, bad.
Don't do it. Just stop it. Just keep developing your own tree, and don't do bad back-merges of the upstream tree. You have absolutely no business merging my random changes like this, and that is doubly true when you do it badly and the end result is just broken and wrong to the point of not even building.
If you really need to do a back-merge, explain WHY. And it had better be some important reason.
In particular, the reson should not be "fix conflict", because you're clearly not particularly good at it.
Yes, I can screw up merges too. It happens. But I do a _lot_ of merges, and as a result I'm pretty good at them. Trying to fix a conflict so that I don't see it is likely to just make things worse.
It makes things worse not only because you're more likely to get it wrong, it makes it worse because it's literally hiding the kinds of development process issues that I want to see so that I am aware of them.
Linus
| |