I noticed that, but was concerned with conflicts, which there are none in this case.
23 and 24 can combined to get rid of the hunk below. I have no issue with losing the history for 23. Mike -----Original Message----- From: Roland Dreier [mailto:[email protected]] Sent: Tuesday, January 04, 2011 1:55 PM To: Mike Marciniszyn Cc: [email protected] Subject: Re: [PATCH 24/24] IB/qib: Improve SERDES tunning on QMH boards > @@ -7596,8 +7616,6 @@ static int serdes_7322_init_new(struct qib_pportdata > *ppd) > /* VGA output common mode */ > ibsd_wr_allchans(ppd, 12, (3 << 2), BMASK(3, 2)); > > - /* Add a delay to allow the SERDES to init */ > - msleep(3000); > return 0; > } Am I confused or is this chunk completely reverting patch 23? Is there any reason you want that patch in the kernel history? - R. -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
