[U-Boot-Users] [PATCH 1/2] Additional PCI IDs for IDE and network controllers

[Wolfgang Denk]

In message <Pine.LNX.4.64.0803310104320.6825 at axis700.grange> you wrote:
> These PCI IDs are required by the Linkstation platforms.
> 
> Signed-off-by: Guennadi Liakhovetski <lg at denx.de>

Sorry, does not apply - please rebase and resubmit:

Applying Additional PCI IDs for IDE and network controllers
error: patch failed: include/pci_ids.h:2073
error: include/pci_ids.h: patch does not apply
Using index info to reconstruct a base tree...
error: patch failed: include/pci_ids.h:2073
error: include/pci_ids.h: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001.


> 
> Sorry for a last minute submission... Woould be good to get this and the 
> following patch in for 1.3.3. Haven't found a PCI custodian, so, CC-ing 
> Wolfgang.

No need to Cc: me. I read this list.

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
It is common sense to take a method and try it. If it fails, admit it
frankly and try another. But above all, try something.
                                              - Franklin D. Roosevelt