From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754591AbZJZChv (ORCPT ); Sun, 25 Oct 2009 22:37:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754511AbZJZChu (ORCPT ); Sun, 25 Oct 2009 22:37:50 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:37678 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754520AbZJZCht (ORCPT ); Sun, 25 Oct 2009 22:37:49 -0400 Date: Mon, 26 Oct 2009 13:37:57 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mika Kuoppala , Jean Delvare , Ben Hutchings Subject: linux-next: manual merge of the net tree with the i2c tree Message-Id: <20091026133757.7cf87e49.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.2; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net tree got a conflict in drivers/net/sfc/sfe4001.c between commit 3f7c0648f727a6d5baf6117653e4001dc877b90b ("i2c: Prevent priority inversion on top of bus lock") from the i2c tree and commit c9597d4f89565b6562bd3026adbe6eac6c317f47 ("sfc: Merge sfe4001.c into falcon_boards.c") from the net tree. I have applied the following merge fixup patch (after removing drivers/net/sfc/sfe4001.c) and can carry it as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au From: Stephen Rothwell Date: Mon, 26 Oct 2009 12:24:55 +1100 Subject: [PATCH] net: merge fixup for drivers/net/sfc/falcon_boards.c Signed-off-by: Stephen Rothwell --- drivers/net/sfc/falcon_boards.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/falcon_boards.c b/drivers/net/sfc/falcon_boards.c index 99f7372..788b336 100644 --- a/drivers/net/sfc/falcon_boards.c +++ b/drivers/net/sfc/falcon_boards.c @@ -327,7 +327,7 @@ static int sfn4111t_reset(struct efx_nic *efx) efx_oword_t reg; /* GPIO 3 and the GPIO register are shared with I2C, so block that */ - mutex_lock(&efx->i2c_adap.bus_lock); + rt_mutex_lock(&efx->i2c_adap.bus_lock); /* Pull RST_N (GPIO 2) low then let it up again, setting the * FLASH_CFG_1 strap (GPIO 3) appropriately. Only change the @@ -343,7 +343,7 @@ static int sfn4111t_reset(struct efx_nic *efx) efx_writeo(efx, ®, FR_AB_GPIO_CTL); msleep(1); - mutex_unlock(&efx->i2c_adap.bus_lock); + rt_mutex_unlock(&efx->i2c_adap.bus_lock); ssleep(1); return 0; -- 1.6.5