[U-Boot-Users] [GIT PULL] Please pull net tree

[U-Boot-Users] [GIT PULL] Please pull net tree

[Ben Warren]

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

[U-Boot-Users] [GIT PULL] Please pull net tree

[Martin Krause]

u-boot-users-bounces at lists.sourceforge.net wrote on :
> 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

[U-Boot-Users] [GIT PULL] Please pull net tree

[Wolfgang Denk]

Dear Ben,

in message <47308E3C.4000103@qstreams.com> you wrote:
> 
> Please pull the net tree.  I believe it's in sync with the main line.

ACK.

> 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?

>   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

Merged. Thanks!

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

[U-Boot-Users] [GIT PULL] Please pull net tree

[Ben Warren]

Wolfgang,

Please pull from the net tree.  I was able to test this with a couple of 
DHCP servers and it seems to work OK for me.


The following changes since commit d78791ae914d4e7c5edca1cdad73b3dc81a4eb82:
  Bartlomiej Sieka (1):
        TQM5200: increase kernel_addr_r and fdt_addr_r (hinted by 
Wolfgang Denk).

are available in the git repository at:

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

Justin Flammia (1):
      DHCP Client Fix

 net/bootp.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

[U-Boot-Users] [GIT PULL] Please pull net tree

[Wolfgang Denk]

Dear Ben,

in message <4726600C.5060709@qstreams.com> you wrote:
> 
> Please pull from the net tree.  I was able to test this with a couple of 
> DHCP servers and it seems to work OK for me.
> 
> 
> The following changes since commit d78791ae914d4e7c5edca1cdad73b3dc81a4eb82:
>   Bartlomiej Sieka (1):
>         TQM5200: increase kernel_addr_r and fdt_addr_r (hinted by 
> Wolfgang Denk).
> 
> are available in the git repository at:
> 
>   git://www.denx.de/git/u-boot-net.git master
> 
> Justin Flammia (1):
>       DHCP Client Fix
> 
>  net/bootp.c |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)

I cherry-picked this single commit from your tree.

Pulling from it threw a lot ot suspicious change messages. Can you
please rebase your tree ASAP? Thanks.

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
They say, well, meybe it _is_ smelly, maybe it _is_ overcrowded, may-
be it _is_ a bit like Hell would be if they shut the  fires  off  and
stabled  a  herd  of  incontinent cows there for a year, but you must
admit that it is full of sheer, vibrant, dynamic _life_.
                                 - Terry Pratchett, _Moving Pictures_

[U-Boot-Users] [GIT PULL] Please pull net tree

[Ben Warren]

Wolfgang Denk wrote:
> Dear Ben,
>
> in message <4726600C.5060709@qstreams.com> you wrote:
>   
>> Please pull from the net tree.  I was able to test this with a couple of 
>> DHCP servers and it seems to work OK for me.
>>
>>
>> The following changes since commit d78791ae914d4e7c5edca1cdad73b3dc81a4eb82:
>>   Bartlomiej Sieka (1):
>>         TQM5200: increase kernel_addr_r and fdt_addr_r (hinted by 
>> Wolfgang Denk).
>>
>> are available in the git repository at:
>>
>>   git://www.denx.de/git/u-boot-net.git master
>>
>> Justin Flammia (1):
>>       DHCP Client Fix
>>
>>  net/bootp.c |   11 +++++++----
>>  1 files changed, 7 insertions(+), 4 deletions(-)
>>     
>
> I cherry-picked this single commit from your tree.
>
> Pulling from it threw a lot ot suspicious change messages. Can you
> please rebase your tree ASAP? Thanks.
>
>   
I'm no git expert, but I believe they're in sync now.  Please let me 
know if there's anything I need to do.

regards,
Ben