Stephen Rothwell wrote:

This is part of the consolidation of the OpenFirmware code ebtween
PowerPC and Sparc.

Signed-off-by: Stephen Rothwell <redacted>
---
 drivers/net/bmac.c           |    5 +++--
 drivers/net/ehea/ehea_main.c |    6 +++---
 drivers/net/mace.c           |    4 ++--
 drivers/net/pasemi_mac.c     |    2 +-
 drivers/net/spider_net.c     |    4 ++--
 drivers/net/sungem.c         |    2 +-
 drivers/net/sungem_phy.c     |    2 +-
 drivers/net/ucc_geth.c       |   18 +++++++++---------
 drivers/net/ucc_geth_mii.c   |    4 ++--
 9 files changed, 24 insertions(+), 23 deletions(-)

Jeff,

This patch is based on a merge between Paulus' for-2.6.22 tree and your
upstream tree.  As such it depends on changes in Paulus' tree to be
merged first.  This patch was originally in Paulus' tree but has been
reverted from there.

Sorry for your being a football here.

AFAICS, looking at the two patches, it seems clear they should go in via 
Paulus's tree.  There are clear dependencies, and it is clearly 
arch-specific code.

If anything, it sounds like I should drop a ucc_geth patch or two from 
my tree.  Is that the case?

	Jeff