Sebastian On 02/09/2018 01:30 PM, Sebastian Andrzej Siewior wrote: > On 2018-02-09 12:59:43 [-0600], Dan Murphy wrote: >> Sebastian > HI Dan, > >> Hmmm I wonder why the compiler does not complain about this warning then. >> >> I will look into it. This warning has been around for a while (4.9-rt as well). > > probably once the local_irq_save() was removed. > >> We also noticed that there are 2 merge conflicts when going to 4.14.18. >> Any comments about providing a merge conflict email to the list? > > I am not sure about how helpful this actually is. Usually I do a RT > release a week while I have stuff in my pipe. Currently Greg is > releasing a lot. On the other hand it is almost two weeks since my last > release. For us it is helpful to have the experts resolve these stable->rt conflicts that occur in the base kernel files. At least if there is a merge conflict that will occur this could be the "stuff" in your pipe. If there were no merge conflicts detected for upcoming merges there would be no expectation to move quicker. I mean GKH 4.14.19 is coming on Monday it may be better just to wait for that to be released then merge that in. There were only 22 patches added to 4.14.19 so it should be minimal. Dan > >> Attached is the merge conflicts we are seeing 4.14.15-> 4.14.18 > > In meantime I already uploaded the patch queue for v4.14.18-rt14. > I plan to sync with Steven's tracing then release -rt15 probably later > today. > >> Dan > > Sebastian > -- ------------------ 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
