From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755125Ab0CCJQk (ORCPT ); Wed, 3 Mar 2010 04:16:40 -0500 Received: from bamako.nerim.net ([62.4.17.28]:55586 "EHLO bamako.nerim.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754984Ab0CCJQi (ORCPT ); Wed, 3 Mar 2010 04:16:38 -0500 Date: Wed, 3 Mar 2010 10:16:35 +0100 From: Jean Delvare To: Stephen Rothwell Cc: Samuel Ortiz , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "=?UTF-8?B?TcOhcnRvbiBOw6ltZXRo?=" Subject: Re: linux-next: manual merge of the mfd tree with the i2c tree Message-ID: <20100303101635.18443234@hyperion.delvare> In-Reply-To: <20100303144715.2b607ac1.sfr@canb.auug.org.au> References: <20100303144715.2b607ac1.sfr@canb.auug.org.au> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; i586-suse-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 Stephen, Samuel, On Wed, 3 Mar 2010 14:47:15 +1100, Stephen Rothwell wrote: > Today's linux-next merge of the mfd tree got a conflict in > drivers/i2c/busses/i2c-isch.c between commit > 482b522a6ced62506aba1c139cb9d4b73e7312f5 ("i2c: Make PCI device ids > constant") from the i2c tree and commit > 1fc8fe094a8ebcc09817246277250898a8d2fc5a ("i2c: convert i2c-isch to > platform_device") from the mfd tree. > > The latter removes the code modified by the former, so I used the latter. I have sent a pull request to Linus yesterday for my i2c tree, which includes the first patch mentioned above. As soon as Linus pulls from it, Samuel will have to adjust the second patch to make it apply again. -- Jean Delvare