From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: linux-next@vger.kernel.org
Subject: linux-next: manual merge of the sparc tree
Date: Wed, 17 Sep 2008 06:27:46 +1000 [thread overview]
Message-ID: <20080917062746.b292a96a.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 656 bytes --]
Hi Dave,
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-09-16 20:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-16 20:27 Stephen Rothwell [this message]
2008-09-16 21:31 ` linux-next: manual merge of the sparc tree David Miller
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=20080917062746.b292a96a.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-next@vger.kernel.org \
/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.