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/