On Mon, Mar 01, 2021 at 04:52:03PM +0800, Peng Tao wrote: > > On 2021/3/1 16:05, Greg Kroah-Hartman wrote: > > On Mon, Mar 01, 2021 at 11:36:16AM +0800, Peng Tao wrote: > > > From: Miklos Szeredi <mszeredi@xxxxxxxxxx> > > > > > > commit d78092e4937de9ce55edcb4ee4c5e3c707be0190 upstream. > > > > > > fix #32833505 > > > > What does this mean? > > > > And why are you all backporting random stable kernel patches to your > > tree and not just taking all of them with a simple merge? > > > > By selectivly cherry-picking patches like this, you are guaranteed to be > > doing more work, and have a much more insecure and buggy kernel. The > > opposite of what your end goal should be, correct? > > > > Hi Greg, > > My apology for the noise. It was due to a mistake in my git config. And > thanks for your suggestions. Our tree is actually a mixture of stable > backports and feature backports. I guess that's why the cherry-picking > method was chosen, since a simple merge creates too many conflicts and it is > error prone to fix them in one shoot. A "simple merge" will cause initial problems, but after you have resolved them the first time, all should be good. As proof that this can work, see the android common kernel trees, which receive a "simple merge" into all of the different branches within a day or two of a stable release, with no problems at all. You need to take all stable patches, doing this cherry-picking will cause you problems and in the end, takes more time and effort! good luck, greg k-h
