All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the sparc tree
Date: Tue, 16 Sep 2008 14:31:37 -0700 (PDT)	[thread overview]
Message-ID: <20080916.143137.134226448.davem@davemloft.net> (raw)
In-Reply-To: <20080917062746.b292a96a.sfr@canb.auug.org.au>

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Sep 2008 06:27:46 +1000

> Today's linux-next merge of the sparc tree got a conflict in
> arch/sparc64/kernel/pci_psycho.c between commit
> f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c("sparc64: Fix OOPS in
> psycho_pcierr_intr_other()") from the sparc-current tree and commit
> e6e003720fd7123482f77dcec19e930d272937fe ("sparc64: Commonize large
> portions of PSYCHO error handling") from the sparc tree.
> 
> The latter moves code that the former modifies.  So, as discsussed, I
> dropped the former fix for today as I assume you will fix it when you
> merge sparc-current.

Thanks Stephen.

I just pushed a merge resolution to this by pulling sparc-2.6
into sparc-next-2.6, moving the PCI config space address
computer into psycho_common.h, and propagating the bug fix
from sparc-2.6 into where the code lives now in psycho_common.c

  reply	other threads:[~2008-09-16 21:31 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-16 20:27 linux-next: manual merge of the sparc tree Stephen Rothwell
2008-09-16 21:31 ` David Miller [this message]
2008-09-16 21:40   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-09-04  1:17 Stephen Rothwell
2008-09-04  1:17 ` David Miller
2008-09-04  4:14   ` Stephen Rothwell
2008-07-16  7:39 Stephen Rothwell
2008-07-18  6:07 ` David Miller
2008-07-16  7:31 Stephen Rothwell
2008-07-16  7:19 Stephen Rothwell
2008-07-16  7:23 ` 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=20080916.143137.134226448.davem@davemloft.net \
    --to=davem@davemloft.net \
    --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 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.