From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [PATCH v5 4/7] arm: omap4: hwmod: introduce emu hwmod Date: Mon, 21 Nov 2011 13:58:28 +0000 Message-ID: <20111121135828.GC20611@mudshark.cambridge.arm.com> References: <1319467559-5518-1-git-send-email-ming.lei@canonical.com> <1319467559-5518-5-git-send-email-ming.lei@canonical.com> <4EC6566C.70202@ti.com> <20111118145635.GB17991@mudshark.cambridge.arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:39553 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755118Ab1KUN6v (ORCPT ); Mon, 21 Nov 2011 08:58:51 -0500 Content-Disposition: inline In-Reply-To: Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Paul Walmsley Cc: Ming Lei , "Cousson, Benoit" , "linux@arm.linux.org.uk" , "tony@atomide.com" , "linux-arm-kernel@lists.infradead.org" , "linux-omap@vger.kernel.org" , "khilman@deeprootsystems.com" On Sun, Nov 20, 2011 at 03:27:19AM +0000, Paul Walmsley wrote: > The OMAP-specific parts should be queued up in my/Beno=EEt's/Tony's t= rees,=20 > rather than placed directly into -next. Otherwise they are likely to= =20 > generate merge conflicts with other OMAP changes that we may generate= =2E >=20 > So I'd suggest splitting patches 1-3 off into a separate series that = Will=20 > can pass on to -next if he wishes. =46ine by me. If Ming Lei posts a new series so that everything is in o= ne thread then I can pick out the bits I want. Cheers, Will -- To unsubscribe from this list: send the line "unsubscribe linux-omap" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: will.deacon@arm.com (Will Deacon) Date: Mon, 21 Nov 2011 13:58:28 +0000 Subject: [PATCH v5 4/7] arm: omap4: hwmod: introduce emu hwmod In-Reply-To: References: <1319467559-5518-1-git-send-email-ming.lei@canonical.com> <1319467559-5518-5-git-send-email-ming.lei@canonical.com> <4EC6566C.70202@ti.com> <20111118145635.GB17991@mudshark.cambridge.arm.com> Message-ID: <20111121135828.GC20611@mudshark.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sun, Nov 20, 2011 at 03:27:19AM +0000, Paul Walmsley wrote: > The OMAP-specific parts should be queued up in my/Beno?t's/Tony's trees, > rather than placed directly into -next. Otherwise they are likely to > generate merge conflicts with other OMAP changes that we may generate. > > So I'd suggest splitting patches 1-3 off into a separate series that Will > can pass on to -next if he wishes. Fine by me. If Ming Lei posts a new series so that everything is in one thread then I can pick out the bits I want. Cheers, Will