From: Linus Torvalds <torvalds@linux-foundation.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [GIT pull] timers/timekeeping for 2.6.32
Date: Sun, 20 Sep 2009 10:05:23 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.2.01.0909201004560.4950@localhost.localdomain> (raw)
In-Reply-To: <20090920074706.GA32245@elte.hu>
On Sun, 20 Sep 2009, Ingo Molnar wrote:
>
> When pulling this you did a merge resolution to
> arch/mips/loongson/common/time.c in commit a03fdb761, but it looks
> suspicious:
>
> void read_persistent_clock(struct timespec *ts)
> {
> ts->tv_sec = return mc146818_get_cmos_time();
> ts->tv_nsec = 0;
> }
>
> that 'return' looks stray, so shouldnt we do the fix below?
Duh. Too much mousing around to cut-and-paste crap.
Linus
prev parent reply other threads:[~2009-09-20 17:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-16 14:56 [GIT pull] timers/timekeeping for 2.6.32 Thomas Gleixner
2009-09-20 7:47 ` Ingo Molnar
2009-09-20 17:05 ` Linus Torvalds [this message]
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=alpine.LFD.2.01.0909201004560.4950@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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