From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH 0/8] OMAP4: hwmod data: Add a bunch of IPs Date: Thu, 17 Feb 2011 08:17:57 -0800 Message-ID: <20110217161756.GO20795@atomide.com> References: <1297938289-8678-1-git-send-email-b-cousson@ti.com> <20110217104207.GB17370@m-desktop> <4D5D0162.6010505@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:20641 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752053Ab1BQQSW (ORCPT ); Thu, 17 Feb 2011 11:18:22 -0500 Content-Disposition: inline In-Reply-To: <4D5D0162.6010505@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "Cousson, Benoit" Cc: "G, Manjunath Kondaiah" , "paul@pwsan.com" , "Hilman, Kevin" , "linux-omap@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "ABRAHAM, KISHON VIJAY" , "DebBarma, Tarun Kanti" , "Raja, Govindraj" , "Varadarajan, Charulatha" , "Lambert, David" , "Ramirez Luna, Omar" , "Semwal, Sumit" , Ohad Ben-Cohen * Cousson, Benoit [110217 03:05]: > > > >McSPI is already merged to l-o master. Will not this series breaks spi > >hwmod? The master branch is just a merge of the various branches, I have not yet merged any of the hwmod touching branches into omap-for-linus. > It will not break, it will just make the merge a little bit painful > for Tony if we do not re-submit the updated McSPI hwmod data for > OMAP4. I'll apply Benoit's patches first, then merge or rebase the hwmod data touching branches with that. This way following hwmod related patches will not have merge conflicts. Regards, Tony