Subject: linux-next: manual merge of the net tree with the infiniband tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 26 Mar 2009 14:27:04 +1100

Hi Dave, Roland,

Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/hw/cxgb3/cxio_hal.h between commit
d1fbe04eee32ed2642cff139b8592866f1d43f41 ("") from the infiniband tree
and commit a73efd0a8552927ebe5dff84936f7fdac4f7e314 ("iw_cxgb3: handle
chip reset notifications") from the net tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/infiniband/hw/cxgb3/cxio_hal.h
index e44dc22,9ed65b0..0000000
--- a/drivers/infiniband/hw/cxgb3/cxio_hal.h
+++ b/drivers/infiniband/hw/cxgb3/cxio_hal.h
@@@ -110,7 -108,8 +110,9 @@@ struct cxio_rdev 
  	struct gen_pool *pbl_pool;
  	struct gen_pool *rqt_pool;
  	struct list_head entry;
 +	struct ch_embedded_info fw_info;
+ 	u32	flags;
+ #define	CXIO_ERROR_FATAL	1
  };
  
  static inline int cxio_num_stags(struct cxio_rdev *rdev_p)