The following changes since commit d3adbde754a9ae7a6f87612055cb20db856f0721:
  Ilpo J
[ message continues ]

From: "John W. Linville" <linville@tuxdriver.com>

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.

-

[ message continues ]

No, in fact I'm quite conscious of that.  I follow a procedure
identical to what you outlined.  I even leave my 'master-davem' branch
available as a reference, and create the initial 'upstream-davem'
branch as a checkout from it. :-)

As an experiment, I cloned your current tree (which has the patches
applied already, thanks!) and created a branch which backed-out the
patches from me you had already applied by hand.  I then did a pull
from my tree, and the results were quite clean.

	[linville]:> git checkout -b jwltest fc26d79bb258b5fdb3dee940bea12d6ef7c217c5
	Switched to a new branch "jwltest"

	[linville]:> git pull git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-davem
	remote: Generating pack...
	remote: Done counting 257 objects.
	remote: Result has 199 objects.
	remote: Deltifying 199 objects...
	remote:  100% (199/199) done
	Indexing 199 objects...
	remote: Total 199 (delta 150), reused 143 (delta 115)
	 100% (199/199) done
	Resolving 150 deltas...
	 100% (150/150) done
	32 objects were added to complete this thin pack.
	Removed drivers/net/wireless/zd1211rw/zd_util.c
	Removed drivers/net/wireless/zd1211rw/zd_util.h
	Merge made by recursive.
	 Documentation/networking/mac80211-injection.txt |   32 ++-
	 drivers/net/wireless/adm8211.c                  |    8 +-
	 drivers/net/wireless/b43/Kconfig                |   12 +
	 drivers/net/wireless/b43/Makefile               |    5 +-
	 drivers/net/wireless/b43/b43.h                  |   11 +-
	 drivers/net/wireless/b43/leds.c                 |  399 ++++++++++-------------
	 drivers/net/wireless/b43/leds.h                 |   63 ++--
	 drivers/net/wireless/b43/main.c                 |  205 ++++--------
	 drivers/net/wireless/b43/phy.c                  |   13 +-
	 drivers/net/wireless/b43/phy.h                  |    2 +-
	 drivers/net/wireless/b43/rfkill.c               |  184 +++++++++++
	 drivers/net/wireless/b43/rfkill.h               |   58 ++++
	 drivers/net/wireless/hostap/hostap.h ...
[ message continues ]

From: "John W. Linville" <linville@tuxdriver.com>

Ok, I'll take some detailed notes next time it happens so we can
figure out why :-)
-

[ message continues ]

Of course, these are intended for 2.6.24.  Also, I forgot to mention
that the individual patches are available here:

	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-davem/

I also preserved the net-2.6.24 commit I based from as 'master-davem'
in case you need it for reference.

Hth!

John


-- 
John W. Linville
linville@tuxdriver.com
-

[ message continues ]