On Tue, May 19, 2015 at 09:12:59AM +0200, Michal Hocko wrote: > On Mon 18-05-15 10:10:50, Linus Torvalds wrote: > > On Mon, May 18, 2015 at 2:31 AM, Peter Zijlstra <pet...@infradead.org> > > wrote: > > > Subject: watchdog: Fix merge 'conflict' > > > > > > Two watchdog changes that came through different trees had a non > > > conflicting conflict, that is, one changed the semantics of a variable > > > but no actual code conflict happened. So the merge appeared fine, but > > > the resulting code did not behave as expected. > > > > Ok, I see that people are still discussing this, but I'll apply it > > as-is since I want to get rc4 out the door, and I guess people can > > tweak this if there's anything else we want to do longer-term. > > The final patch from Peter has a typo. Without the following the system > deadlocks obviously:
Duh, sorry about that. :/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
