From: Peter Zijlstra <peterz@infradead.org>
To: Michal Hocko <mhocko@suse.cz>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Stephane Eranian <eranian@google.com>,
Ulrich Obergfell <uobergfe@redhat.com>,
Don Zickus <dzickus@redhat.com>, Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Kevin Hilman <khilman@kernel.org>,
Ulf Hansson <ulf.hansson@linaro.org>,
"linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: suspend regression in 4.1-rc1
Date: Tue, 19 May 2015 09:39:58 +0200 [thread overview]
Message-ID: <20150519073958.GD19282@twins.programming.kicks-ass.net> (raw)
In-Reply-To: <20150519071259.GA6847@dhcp22.suse.cz>
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 <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.
>
> The final patch from Peter has a typo. Without the following the system
> deadlocks obviously:
Duh, sorry about that. :/
next prev parent reply other threads:[~2015-05-19 7:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-17 18:50 Michal Hocko
2015-05-18 1:49 ` Sergey Senozhatsky
2015-05-18 4:33 ` Linus Torvalds
2015-05-18 7:30 ` Peter Zijlstra
2015-05-18 8:41 ` Peter Zijlstra
2015-05-18 9:03 ` Michal Hocko
2015-05-18 9:31 ` Peter Zijlstra
2015-05-18 10:56 ` Ulrich Obergfell
2015-05-18 11:05 ` Peter Zijlstra
2015-05-18 12:13 ` Stephane Eranian
2015-05-18 14:26 ` Don Zickus
2015-05-18 14:41 ` Michal Hocko
2015-05-18 15:45 ` Don Zickus
2015-05-19 17:20 ` Michal Hocko
2015-05-18 14:20 ` Don Zickus
2015-05-18 17:10 ` Linus Torvalds
2015-05-19 7:12 ` Michal Hocko
2015-05-19 7:39 ` Peter Zijlstra [this message]
2015-05-18 10:10 ` Ulrich Obergfell
2015-05-18 10:51 ` Peter Zijlstra
2015-05-18 12:03 ` Michal Hocko
2015-05-18 5:18 ` Omar Sandoval
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150519073958.GD19282@twins.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=dzickus@redhat.com \
--cc=eranian@google.com \
--cc=khilman@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=mingo@elte.hu \
--cc=rjw@rjwysocki.net \
--cc=torvalds@linux-foundation.org \
--cc=ulf.hansson@linaro.org \
--cc=uobergfe@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome