lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Tue, 02 Oct 2007 19:01:56 -0700 (PDT)
From:	David Miller <>
Subject: Re: Please pull 'upstream-davem' branch of wireless-2.6

From: "John W. Linville" <>
Date: Tue, 2 Oct 2007 21:25:52 -0400

>   git:// upstream-davem

This doesn't pull cleanly.

Probably you used a recently cloned Linus tree, pulled
net-2.6.24 into that (and resolved the conflicts), and
then put your patches in.

Please don't do it like that, I don't want to pull from
a tree that has linus vs. net-2.6.24 conflict handling
in it.  That's why I usually rebase frequently, to minimize
that as much as is humanly possible.

What you can do is figure out what linus's HEAD was at the last rebase
(basically 'origin' or parent of net-2.6.24), clone that then pull in
net-2.6.24, then add your patches.

That way I can always do a clean pull.

My pull from Jeff today was very clean, for example.

I'll add these wireless bits by hand as patches.

Thanks John.

To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to
More majordomo info at

Powered by blists - more mailing lists