From mboxrd@z Thu Jan 1 00:00:00 1970 From: jamie@jamieiles.com (Jamie Iles) Date: Tue, 13 Sep 2011 13:56:10 +0100 Subject: Merging Cadence macb/gem patches In-Reply-To: <20110830103655.GE5414@pulham.picochip.com> References: <20110830103655.GE5414@pulham.picochip.com> Message-ID: <20110913125610.GE2781@pulham.picochip.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Aug 30, 2011 at 11:36:55AM +0100, Jamie Iles wrote: > Hi Arnd, > > I have a series of patches[1] to add support for the Cadence GEM > Ethernet MAC to the macb driver. A while back, DaveM said that he would > be happy for these to go through an ARM tree[2], so would you pull these > into the arm-soc tree? > > At the moment my patches are based on 3.1-rc1, but since then the > drivers have been moved about and git merge doesn't seem to resolve > this, so should I base them on the commit that moved them from the > netdev tree? I'm not sure how to handle this. Hi Arnd, Would you be able to take these if I send you a pull request please? Thanks, Jamie