From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wolfgang Denk Date: Tue, 06 Dec 2011 21:26:05 +0100 Subject: [U-Boot] [PATCH v2 2/4] macb: support higher rate GEM MDIO clock divisors In-Reply-To: <1318251753-23604-2-git-send-email-fovsoft@gmail.com> References: <1318251753-23604-1-git-send-email-fovsoft@gmail.com> <1318251753-23604-2-git-send-email-fovsoft@gmail.com> Message-ID: <20111206202605.7D7041A32820@gemini.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 Dear Dave Aldridge, In message <1318251753-23604-2-git-send-email-fovsoft@gmail.com> you wrote: > GEM devices support larger clock divisors and have a different > range of divisors. Program the MDIO clock divisors based on the > device type. > > Signed-off-by: Dave Aldridge > --- > drivers/net/macb.c | 63 ++++++++++++++++++++++++++++++++++++++-------------- > drivers/net/macb.h | 12 ++++++++++ > 2 files changed, 58 insertions(+), 17 deletions(-) No, not applied - doesn't apply: Description: [U-Boot,2/4] macb: support higher rate GEM MDIO clock divisors Applying: macb: support higher rate GEM MDIO clock divisors fatal: sha1 information is lacking or useless (drivers/net/macb.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 macb: support higher rate GEM MDIO clock divisors Please fix / rebase and resubmit. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "This is a test of the Emergency Broadcast System. If this had been an actual emergency, do you really think we'd stick around to tell you?"