Skip to contentSkip to conversation

Please pull net tree

GIT PULL Ben Warren 3 participants 3 messages Nov 6, 2007 – Nov 16, 2007

lore
Share & tools
lore

Ben Warren

author
#0 lore raw

Wolfgang,

Please pull the net tree. I believe it's in sync with the main line.

P.S. is there a way to get rid of the merge log entries from when I sync with the main line, or do we want them there?

The following changes since commit 992742a5b09d9040adbd156fb90756af66ade310:
Wolfgang Denk (1):
Cleanup coding style; update CHANGELOG

are available in the git repository at:

git://www.denx.de/git/u-boot-net master

Ben Warren (2):
Merge git://www.denx.de/git/u-boot
Merge git://www.denx.de/git/u-boot

Justin Flammia (1):
DHCP Client Fix

Larry Johnson (2):
NET: Cosmetic changes
NET: Add Ethernet 1000BASE-X support for PPC4xx

Roy Zang (1):
Implement general ULi 526x Ethernet driver support in U-boot

 common/cmd_mii.c    |    8 +-
 common/miiphyutil.c |  282 ++++++++-------
 drivers/Makefile    |    2 +-
 drivers/uli526x.c   |  996 
+++++++++++++++++++++++++++++++++++++++++++++++++++
 include/miiphy.h    |  114 ++++---
 net/eth.c           |    4 +
 6 files changed, 1227 insertions(+), 179 deletions(-)
 create mode 100644 drivers/uli526x.c
#1 lore raw

u-boot-users-bounces at lists.sourceforge.net wrote on :

Quoted 6 lines

Wolfgang,

Please pull the net tree. I believe it's in sync with the main line.

P.S. is there a way to get rid of the merge log entries from when I sync with the main line, or do we want them there?

I see no advantage in the presence of this log entries. AFAIK the only way to avoid this is to do a git rebase instead of a git merge/pull (as described by Jerry recently
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/32962/match=mpc8641hpcn+board)
The disadvantage is a messed up git history for everyone who already pulled from this branch. On a seperated "merge" branch
- as proposed by Jerry a few times now ;-) - this wouldn't hurt much, but on the master branch this is maybe suboptimal.

Best Regards,
Marti Krause

#2 lore raw
In reply to Ben Warren

Dear Ben,

Quoted 2 lines · in message <[email protected]> you wrote:

Please pull the net tree. I believe it's in sync with the main line.

ACK.

Quoted 2 lines

P.S. is there a way to get rid of the merge log entries from when I sync with the main line, or do we want them there?

I can's answer this one. JDL?

Quoted 16 lines

git://www.denx.de/git/u-boot-net master

Ben Warren (2):
Merge git://www.denx.de/git/u-boot
Merge git://www.denx.de/git/u-boot

Justin Flammia (1):
DHCP Client Fix

Larry Johnson (2):
NET: Cosmetic changes
NET: Add Ethernet 1000BASE-X support for PPC4xx

Roy Zang (1):
Implement general ULi 526x Ethernet driver support in U-boot

Quoted 9 lines
 common/cmd_mii.c    |    8 +-
 common/miiphyutil.c |  282 ++++++++-------
 drivers/Makefile    |    2 +-
 drivers/uli526x.c   |  996 
+++++++++++++++++++++++++++++++++++++++++++++++++++
 include/miiphy.h    |  114 ++++---
 net/eth.c           |    4 +
 6 files changed, 1227 insertions(+), 179 deletions(-)
 create mode 100644 drivers/uli526x.c

Merged. Thanks!

Best regards,

Wolfgang Denk

Signature · 5 lines
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
A door is what a dog is perpetually on the wrong side of.
                                                        - Ogden Nash