All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Thomas Gleixner <tglx@linutronix.de>,
	"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:53:13 +0200	[thread overview]
Message-ID: <20090824085313.GB29804@elte.hu> (raw)
In-Reply-To: <20090824081723.GA4798@osiris.boeblingen.de.ibm.com>


* Heiko Carstens <heiko.carstens@de.ibm.com> wrote:

> 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.

thanks Heiko.

Note that such simpler conflicts can be kept just fine (i.e. there's 
no hard need to revert) - especially now that Stephen has already 
resolved it and tested the end result, and git-rerere will pick it 
up in the future too.

The most valuable conflicts in linux-next are the ones that show 
conflicts that should never occur: which happen due to trees doing 
changes they should not do.

	Ingo

  parent reply	other threads:[~2009-08-24  8:53 UTC|newest]

Thread overview: 14+ 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
2009-08-24  8:23   ` Stephen Rothwell
2009-08-24  8:53   ` Ingo Molnar [this message]
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

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=20090824085313.GB29804@elte.hu \
    --to=mingo@elte.hu \
    --cc=heiko.carstens@de.ibm.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.