From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Date: Thu, 10 Oct 2013 22:14:08 +0000 Subject: Re: [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 Message-Id: List-Id: References: <20131009045354.GA8369@verge.net.au> <87k3hkokd5.fsf@linaro.org> In-Reply-To: <87k3hkokd5.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org On Thu, Oct 10, 2013 at 3:02 PM, Kevin Hilman wrote: > Simon Horman writes: > >> On Tue, Oct 08, 2013 at 06:05:24PM +0900, Simon Horman wrote: >>> Hi Kevin, Olof and Arnd, >>> >>> please consider this Second round of Renesas ARM based SoC cleanups for v3.13. >>> It is based on renesas-cleanup-for-v3.13 which you have previously pulled. >> >> This pull-request causes some conflicts in >> arch/arm/mach-shmobile/board-bockw.c. In general the resolution >> strategy should be to take everything. > > Thanks for the heads up. I assume you meant board-lager.c though, > right? That's where I saw the conflict. Nevermind, I see the conflict you were referring to now. The one I found was a conflict between your first cleanup tag and this one. Feel free to base subsequent cleanup branches on the previous ones if there are dependencies/conflicts like this. Kevin From mboxrd@z Thu Jan 1 00:00:00 1970 From: khilman@linaro.org (Kevin Hilman) Date: Thu, 10 Oct 2013 15:14:08 -0700 Subject: [GIT PULL] Second round of Renesas ARM based SoC cleanups for v3.13 In-Reply-To: <87k3hkokd5.fsf@linaro.org> References: <20131009045354.GA8369@verge.net.au> <87k3hkokd5.fsf@linaro.org> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Oct 10, 2013 at 3:02 PM, Kevin Hilman wrote: > Simon Horman writes: > >> On Tue, Oct 08, 2013 at 06:05:24PM +0900, Simon Horman wrote: >>> Hi Kevin, Olof and Arnd, >>> >>> please consider this Second round of Renesas ARM based SoC cleanups for v3.13. >>> It is based on renesas-cleanup-for-v3.13 which you have previously pulled. >> >> This pull-request causes some conflicts in >> arch/arm/mach-shmobile/board-bockw.c. In general the resolution >> strategy should be to take everything. > > Thanks for the heads up. I assume you meant board-lager.c though, > right? That's where I saw the conflict. Nevermind, I see the conflict you were referring to now. The one I found was a conflict between your first cleanup tag and this one. Feel free to base subsequent cleanup branches on the previous ones if there are dependencies/conflicts like this. Kevin