linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Russell King <rmk@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Andi Kleen <andi@firstfloor.org>,
	Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the arm tree
Date: Mon, 7 Jul 2008 10:12:43 +0100	[thread overview]
Message-ID: <20080707091243.GA1842@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20080704165712.3d941be3.sfr@canb.auug.org.au>

On Fri, Jul 04, 2008 at 04:57:12PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/kernel/time.c between commit
> 5b01a6a61c48d8e6ab4679d6e6208f5962d07b85 ("sysdev: Pass the attribute to
> the low level sysdev show/store function") from the driver-core tree and
> commit 205bee6ad804d7034773b5978c74dde495df2301 ("[ARM] dyntick: Remove
> obsolete and unused ARM dyntick support") from the arm tree.
> 
> The arm commit just removed some code that the driver-core commit
> modified.  So I removed it and can carry the fixup.

I think that's a merge issue which Linus is also going to have to deal
with when it happens, since there's no real solution to committing
"fixes" to our trees without the fix causing the tree in isolation to
break.

Note that the commit is not a new commit, but something that's been there
since the last merge window - it has, however, recently been rebased.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

  reply	other threads:[~2008-07-07  9:13 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-04  6:57 linux-next: manual merge of the arm tree Stephen Rothwell
2008-07-07  9:12 ` Russell King [this message]
2008-07-07 10:39   ` Stephen Rothwell
2008-07-10  4:33 Stephen Rothwell
2008-07-10  6:29 ` pHilipp Zabel
2008-07-10  7:30 ` Russell King
2008-08-25  1:03 Stephen Rothwell
2008-08-26 22:20 ` Russell King
2008-08-26 23:43   ` Stephen Rothwell
2008-10-14  2:27 Stephen Rothwell
2008-10-14  7:59 ` Russell King
2008-10-14  8:07   ` David Brownell
2008-10-14 20:08     ` Tony Lindgren
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the arm tree Thierry Reding
2013-10-25 15:20   ` Dmitry Kravkov

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=20080707091243.GA1842@flint.arm.linux.org.uk \
    --to=rmk@arm.linux.org.uk \
    --cc=andi@firstfloor.org \
    --cc=greg@kroah.com \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).