Dear Peter Tyser,
In message 1262821277-2922-1-git-send-email-ptyser@xes-inc.com you wrote:
When referring to PCIe and USB 'endpoint' is the standard naming convention.
Signed-off-by: Peter Tyser ptyser@xes-inc.com
I could only take so much of seeing "End Point" on every bootup before I cracked:)
board/amcc/yucca/yucca.c | 2 +- board/atum8548/atum8548.c | 2 +- board/freescale/mpc8536ds/mpc8536ds.c | 6 +++--- board/freescale/mpc8544ds/mpc8544ds.c | 6 +++--- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/mpc8568mds/mpc8568mds.c | 2 +- board/freescale/mpc8569mds/mpc8569mds.c | 2 +- board/freescale/mpc8572ds/mpc8572ds.c | 6 +++--- board/freescale/mpc8610hpcd/mpc8610hpcd.c | 4 ++-- board/freescale/p1_p2_rdb/pci.c | 4 ++-- board/freescale/p2020ds/p2020ds.c | 6 +++--- board/tqc/tqm85xx/tqm85xx.c | 2 +- board/xes/common/fsl_8xxx_pci.c | 6 +++--- cpu/ppc4xx/4xx_pcie.c | 4 ++-- drivers/usb/musb/musb_core.h | 2 +- include/usb/ehci-fsl.h | 24 ++++++++++++------------ 16 files changed, 40 insertions(+), 40 deletions(-)
This patch does not apply:
Applying: PCIe, USB: Replace 'end point' references with 'endpoint' error: patch failed: board/atum8548/atum8548.c:208 error: board/atum8548/atum8548.c: patch does not apply error: patch failed: board/freescale/mpc8536ds/mpc8536ds.c:222 error: board/freescale/mpc8536ds/mpc8536ds.c: patch does not apply error: patch failed: board/freescale/mpc8544ds/mpc8544ds.c:131 error: board/freescale/mpc8544ds/mpc8544ds.c: patch does not apply error: patch failed: board/freescale/mpc8548cds/mpc8548cds.c:361 error: board/freescale/mpc8548cds/mpc8548cds.c: patch does not apply error: patch failed: board/freescale/mpc8568mds/mpc8568mds.c:429 error: board/freescale/mpc8568mds/mpc8568mds.c: patch does not apply error: patch failed: board/freescale/mpc8569mds/mpc8569mds.c:544 error: board/freescale/mpc8569mds/mpc8569mds.c: patch does not apply error: patch failed: board/freescale/mpc8572ds/mpc8572ds.c:196 error: board/freescale/mpc8572ds/mpc8572ds.c: patch does not apply error: patch failed: board/freescale/mpc8610hpcd/mpc8610hpcd.c:249 error: board/freescale/mpc8610hpcd/mpc8610hpcd.c: patch does not apply error: patch failed: board/freescale/p1_p2_rdb/pci.c:68 error: board/freescale/p1_p2_rdb/pci.c: patch does not apply error: patch failed: board/freescale/p2020ds/p2020ds.c:224 error: board/freescale/p2020ds/p2020ds.c: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging board/atum8548/atum8548.c CONFLICT (content): Merge conflict in board/atum8548/atum8548.c Auto-merging board/freescale/mpc8536ds/mpc8536ds.c CONFLICT (content): Merge conflict in board/freescale/mpc8536ds/mpc8536ds.c Auto-merging board/freescale/mpc8544ds/mpc8544ds.c CONFLICT (content): Merge conflict in board/freescale/mpc8544ds/mpc8544ds.c Auto-merging board/freescale/mpc8548cds/mpc8548cds.c CONFLICT (content): Merge conflict in board/freescale/mpc8548cds/mpc8548cds.c Auto-merging board/freescale/mpc8568mds/mpc8568mds.c CONFLICT (content): Merge conflict in board/freescale/mpc8568mds/mpc8568mds.c Auto-merging board/freescale/mpc8569mds/mpc8569mds.c CONFLICT (content): Merge conflict in board/freescale/mpc8569mds/mpc8569mds.c Auto-merging board/freescale/mpc8572ds/mpc8572ds.c Auto-merging board/freescale/mpc8610hpcd/mpc8610hpcd.c CONFLICT (content): Merge conflict in board/freescale/mpc8610hpcd/mpc8610hpcd.c Auto-merging board/freescale/p1_p2_rdb/pci.c Auto-merging board/freescale/p2020ds/p2020ds.c Auto-merging board/tqc/tqm85xx/tqm85xx.c Auto-merging drivers/usb/musb/musb_core.h Failed to merge in the changes.
Best regards,
Wolfgang Denk