Steve On 02/06/2018 10:17 AM, Steven Rostedt wrote: > On Tue, 6 Feb 2018 09:47:15 -0600 > Dan Murphy <dmurphy@xxxxxx> wrote: > >> This is where we can put an automated job in place to merge GKH rc >> stable into the RT branch and report only upcoming merge conflicts. >> Then no one actually has to report or ask it would just be assumed? > > I'd be careful about this. There's a few (not many) subtle changes that > get backported to stable that can break RT. You wont be able to notice > it with compiling, but it can cause deadlocks in certain scenarios. > We agree merge conflicts are only half the battle. I guess I was not clear that the auto merge would not be distributed or even public it would just be informative. It would just be a test for merge conflicts. And maybe build errors/warnings if we had a limited set of defconfig options. Again the merge would be informative so we would know that the Linux stable will merge cleanly or not. If there was a conflict then that could trigger the merging of the stable into the RT branch to help the community consumers of the RT branch. Dan > -- Steve > -- ------------------ Dan Murphy -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
