Messages in this thread | | | Date | Mon, 18 May 2015 10:10:50 -0700 | Subject | Re: suspend regression in 4.1-rc1 | From | Linus Torvalds <> |
| |
On Mon, May 18, 2015 at 2:31 AM, Peter Zijlstra <peterz@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.
Linus
| |