From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Roese Date: Mon, 3 Nov 2008 08:53:13 +0100 Subject: [U-Boot] [PATCH 1/3] Changed PPC4xx EMAC driver to require CONFIG_PPC4xx_EMAC In-Reply-To: <490B8EB2.9060604@gmail.com> References: <> <200810311116.11086.sr@denx.de> <490B8EB2.9060604@gmail.com> Message-ID: <200811030853.13889.sr@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Ben, On Saturday 01 November 2008, Ben Warren wrote: > > Patch failed at 0001. > > When you have resolved this problem run "git am -3 --resolved". > > If you would prefer to skip this patch, instead run "git am -3 --skip". > > To restore the original branch and stop patching run "git am -3 --abort". > > Yeah, I probably should have grouped all the net/eth.c patches > together. If you install the other ones sent at the same time I expect > it will apply. I'll re-base this one for you so you can test it. Thanks. > > Could you please rebase it for me? > > > > And how should we handle these patches? Should they go in via my > > repository? > > I was hoping you'd ACK them and I'd apply to -net, since it's but one of > many controllers I'm messing with. Sure. After I had a chance to test them, I'll send the ACK and you can apply them to your -net repository. Best regards, Stefan ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================