Re: [PATCHes] pull request: WAN

From: Jeff Garzik
Date: Tue Jul 22 2008 - 17:40:18 EST

Krzysztof Halasa wrote:
Hi Jeff,

Please pull from:
git:// hdlc

This is based on pure v2.6.26 and includes various WAN cleanups as
well as LMC, Zilog (hostess_sv11 + sealevel = z85230) and Cosa drivers
ported from syncppp to generic HDLC. I have no hardware for that so -

This makes hdlc-ppp the only user of syncppp.

My plan is to replace hdlc-ppp and syncppp with the new hdlc-ppp, hope
that's now ok with syncppp going.

The long-term plan is to also add generic PPP interface so users can
do PPP auth, compression and what not. 2.6.30+ maybe.

I have tried to test-merge your upstream-next branch and it causes
conflicts in drivers/net/wan/pc300_drv.c (a trivial one) and
net/netfilter/nf_conntrack_proto_tcp.c (some pre-2.6.26 thing I

The first commits in my tree (after v2.6.26) are already in your tree,
you've got them by mail. It seems that git knows that.

Anything in upstream-next went upstream, and so we need to apply this on top of the current Linus upstream (torvalds/linux-2.6.git) at the very least.

Would you mind doing that, please?

Also, git pulls are great, but it would be helpful if you supply a git-shortlog summary of the changes, and the patch (>400k will only go to me, list will ignore).


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at