Re: [linux-yocto] v4.18.x - stable updates comprising v4.18.42
[Re: v4.18.x - stable updates comprising v4.18.42] On 25/08/2019 (Sun 22:10) Bruce Ashfield wrote: > On Sun, Aug 18, 2019 at 10:14 AM Paul Gortmaker > wrote: > > > > Bruce, Yocto kernel folks: > > > > Here is the next 4.18.x stable update "extension" primarily created > > for the Yocto project, continuing from the previous v4.18.41 release. [...] > Hey Paul, > > I was merging this tonight and ran into a nasty -rt merge conflict in > kernel/irq_work.c. Can you take a look and send a resolution ? When I > compared the 4.19-rt and 5.x-rt branches, I didn't see an obvious way > to resolve things. So it might not have been obvious, but there is a 4.19-rt resolution buried in there in linux-stable-rt commit e51f31ad716a485ed5bada8d367df60d6a99b9ac Merge: 3cfcdc4d74dc 0df021b2e841 Author: Steven Rostedt (VMware) Date: Fri Jun 14 12:54:23 2019 -0400 Merge tag 'v4.19.47' into v4.19-rt This is the 4.19.47 stable release Conflicts: drivers/char/random.c kernel/irq_work.c ...and since the 4.18.42 irq_work.c is identical to 4.19.47, we can just re-use Steve's conflict resolution by wholesale importing the 4.19-rt version of his file after his merge. Paul. -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] v4.18.x - stable updates comprising v4.18.42
[Re: v4.18.x - stable updates comprising v4.18.42] On 25/08/2019 (Sun 22:10) Bruce Ashfield wrote: > On Sun, Aug 18, 2019 at 10:14 AM Paul Gortmaker > wrote: > > > > Bruce, Yocto kernel folks: > > > > Here is the next 4.18.x stable update "extension" primarily created > > for the Yocto project, continuing from the previous v4.18.41 release. > > > > There are about 150 commits here, based on the remaining commits that > > were used in the 4.19.46/47 stable releases -- but not put into the > > previous 4.10.40 release in order to keep the commit count reasonable. > > > > These 4.18 stable backport releases will be ending in September, as I > > will be moving to working on newer kernels. Hopefully with the same > > messaging being in the last few releases, this is no surprise to anyone, > > and people are in the final stages of getting their own maintenance or > > migration plans in place and rolled out. > > > > I've put this 4.18.x queue through the usual testing; build testing > > on x86-64/32, ARM-64/32, PPC and MIPS, plus some static analysis > > and finally some sanity runtime tests on x86-64. > > > > I did the signed tag just as per the previously released versions. > > Please find a signed v4.18.42 tag using this key: > > > > Hey Paul, > > I was merging this tonight and ran into a nasty -rt merge conflict in > kernel/irq_work.c. Can you take a look and send a resolution ? When I > compared the 4.19-rt and 5.x-rt branches, I didn't see an obvious way > to resolve things. I will have a look. Nothing in the application of patches to the standard kernel indicated any similar conflict, so hopefully it won't be a complex resolution. P. -- > > Bruce > > > http://pgp.mit.edu/pks/lookup?op=vindex=0xEBCE84042C07D1D6 > > > > in the repo in the kernel.org directory here: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-4.18.y.git/?h=linux-4.18.y > > git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-4.18.y.git > > > > for merge to standard/base in linux-yocto-4.18 and then out from there > > into the other base and BSP branches. > > > > For those who are interested, the evolution of the commits is here: > > > > > > https://git.kernel.org/cgit/linux/kernel/git/paulg/longterm-queue-4.18.git/ > > > > This repo isn't needed for anything; it just exists for transparency and > > so people can see the evolution of the raw commits that were originally > > selected to create this 4.18.x release. > > > > Paul. > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
Re: [linux-yocto] v4.18.x - stable updates comprising v4.18.42
On Sun, Aug 18, 2019 at 10:14 AM Paul Gortmaker wrote: > > Bruce, Yocto kernel folks: > > Here is the next 4.18.x stable update "extension" primarily created > for the Yocto project, continuing from the previous v4.18.41 release. > > There are about 150 commits here, based on the remaining commits that > were used in the 4.19.46/47 stable releases -- but not put into the > previous 4.10.40 release in order to keep the commit count reasonable. > > These 4.18 stable backport releases will be ending in September, as I > will be moving to working on newer kernels. Hopefully with the same > messaging being in the last few releases, this is no surprise to anyone, > and people are in the final stages of getting their own maintenance or > migration plans in place and rolled out. > > I've put this 4.18.x queue through the usual testing; build testing > on x86-64/32, ARM-64/32, PPC and MIPS, plus some static analysis > and finally some sanity runtime tests on x86-64. > > I did the signed tag just as per the previously released versions. > Please find a signed v4.18.42 tag using this key: > Hey Paul, I was merging this tonight and ran into a nasty -rt merge conflict in kernel/irq_work.c. Can you take a look and send a resolution ? When I compared the 4.19-rt and 5.x-rt branches, I didn't see an obvious way to resolve things. Bruce > http://pgp.mit.edu/pks/lookup?op=vindex=0xEBCE84042C07D1D6 > > in the repo in the kernel.org directory here: > > > https://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-4.18.y.git/?h=linux-4.18.y > git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-4.18.y.git > > for merge to standard/base in linux-yocto-4.18 and then out from there > into the other base and BSP branches. > > For those who are interested, the evolution of the commits is here: > > https://git.kernel.org/cgit/linux/kernel/git/paulg/longterm-queue-4.18.git/ > > This repo isn't needed for anything; it just exists for transparency and > so people can see the evolution of the raw commits that were originally > selected to create this 4.18.x release. > > Paul. -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
[linux-yocto] v4.18.x - stable updates comprising v4.18.42
Bruce, Yocto kernel folks: Here is the next 4.18.x stable update "extension" primarily created for the Yocto project, continuing from the previous v4.18.41 release. There are about 150 commits here, based on the remaining commits that were used in the 4.19.46/47 stable releases -- but not put into the previous 4.10.40 release in order to keep the commit count reasonable. These 4.18 stable backport releases will be ending in September, as I will be moving to working on newer kernels. Hopefully with the same messaging being in the last few releases, this is no surprise to anyone, and people are in the final stages of getting their own maintenance or migration plans in place and rolled out. I've put this 4.18.x queue through the usual testing; build testing on x86-64/32, ARM-64/32, PPC and MIPS, plus some static analysis and finally some sanity runtime tests on x86-64. I did the signed tag just as per the previously released versions. Please find a signed v4.18.42 tag using this key: http://pgp.mit.edu/pks/lookup?op=vindex=0xEBCE84042C07D1D6 in the repo in the kernel.org directory here: https://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-4.18.y.git/?h=linux-4.18.y git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-4.18.y.git for merge to standard/base in linux-yocto-4.18 and then out from there into the other base and BSP branches. For those who are interested, the evolution of the commits is here: https://git.kernel.org/cgit/linux/kernel/git/paulg/longterm-queue-4.18.git/ This repo isn't needed for anything; it just exists for transparency and so people can see the evolution of the raw commits that were originally selected to create this 4.18.x release. Paul. -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
