From: Heiko Carstens <heiko.carstens@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: Re: linux-next: manual merge of the tip tree with the s390 tree
Date: Mon, 24 Aug 2009 10:17:23 +0200 [thread overview]
Message-ID: <20090824081723.GA4798@osiris.boeblingen.de.ibm.com> (raw)
In-Reply-To: <20090824170119.57cf4f59.sfr@canb.auug.org.au>
On Mon, Aug 24, 2009 at 05:01:19PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/s390/kernel/time.c between commit
> 6342887c12d79c5a2c8c1de5be6f483e16a2acdd ("[S390] introduce
> get_clock_monotonic") from the s390 tree and commit
> 23970e389e9cee43c4b41023935e1417271708b2 ("timekeeping: Introduce
> read_boot_clock") from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
I reverted the sched_clock_base_cc rename. The merge conflict
should be gone as soon as Martin pushes a new tree out.
next prev parent reply other threads:[~2009-08-24 8:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-24 7:01 linux-next: manual merge of the tip tree with the s390 tree Stephen Rothwell
2009-08-24 8:17 ` Heiko Carstens [this message]
2009-08-24 8:23 ` Stephen Rothwell
2009-08-24 8:53 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2012-03-14 3:46 Stephen Rothwell
2013-02-07 2:50 Stephen Rothwell
2015-08-20 5:32 Stephen Rothwell
2017-10-11 15:51 Mark Brown
2017-11-13 5:30 ` Stephen Rothwell
2017-11-01 6:04 Stephen Rothwell
2019-05-06 6:58 Stephen Rothwell
2023-02-10 1:00 Stephen Rothwell
2023-02-21 23:03 ` Stephen Rothwell
2023-04-18 13:40 broonie
2025-03-19 4:54 Stephen Rothwell
2025-03-19 19:50 ` Ingo Molnar
2025-03-28 14:16 ` Joel Granados
2025-03-26 1:28 ` Stephen Rothwell
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=20090824081723.GA4798@osiris.boeblingen.de.ibm.com \
--to=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
--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