linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Walker <dwalker@mvista.com>,
	linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org,
	Paul Mackerras <paulus@samba.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the powerpc tree
Date: Fri, 11 Jul 2008 21:01:25 +0200	[thread overview]
Message-ID: <200807112101.25704.bzolnier@gmail.com> (raw)
In-Reply-To: <20080707230717.10429faf.sfr@canb.auug.org.au>


Hi,

On Monday 07 July 2008, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the powerpc tree got a conflict in
> drivers/macintosh/mediabay.c between commit
> 7ad963b103d3863b1161c59f3e65a435979804ed ("ide-pmac: media-bay support
> fixes (take 4)") from the ide tree and commit
> 9a24729d8aeef967eac7af71c6a69edc83d06558 ("macintosh/media bay: Convert
> semaphore to mutex") from the powerpc tree.

Since I haven't heard back from Ben [1] on ide-pmac/media-bay IRQ issue
I took another look at ide-pmac patches and I think that it should be
possible to rework them in such way that consecutive ide patches (> 100)
won't depend on "ide-pmac: media-bay support fixes (take 4)" patch.

This would allow us to re-schedule it to 2.6.28 (which is probably what
we want because 2.6.26 is probably just around the corner and we will be
pretty busy with 2.6.27 merge window soon).  Ben, what's your opinion?

[1] which doesn't surprise me given his new responsibilities ;)

Thanks,
Bart

  parent reply	other threads:[~2008-07-10 19:05 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-07 13:07 linux-next: manual merge of the powerpc tree Stephen Rothwell
2008-07-07 21:13 ` Daniel Walker
2008-07-11 19:01 ` Bartlomiej Zolnierkiewicz [this message]
2008-07-12  3:41   ` Benjamin Herrenschmidt
  -- strict thread matches above, loose matches on Subject: below --
2008-10-14  1:02 Stephen Rothwell
2008-10-14  1:02 Stephen Rothwell
2008-07-14  5:44 Stephen Rothwell
2008-07-15  1:24 ` Steven Rostedt
2008-07-03  3:39 Stephen Rothwell
2008-07-03  5:47 ` Grant Likely
2008-07-03 12:22   ` Jon Smirl
2008-07-03 15:24     ` Grant Likely
2008-07-04  5:54       ` Grant Likely
2008-07-04  7:35         ` Jean Delvare
2008-07-01  6:48 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=200807112101.25704.bzolnier@gmail.com \
    --to=bzolnier@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=dwalker@mvista.com \
    --cc=linux-next@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@samba.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).