On Mon, 2008-10-27 at 15:52 -0700, David Miller wrote:
quoted text
> From: Johannes Berg <johannes@sipsolutions.net>
> Date: Sat, 25 Oct 2008 01:50:43 +0200
>=20
> > Also remove a few stray DECLARE_MAC_BUF that were no longer
> > used at all.
> >=20
> > Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
> > ---
> > Not sure this will apply to your tree, I prepared it against John's tre=
e
quoted text
> > which might have more things. If you put the previous patch in, I
> > suppose John _could_ put it into his tree, but then he'd have to pull i=
n
quoted text
> > yours which he normally doesn't... No idea. I can also just postpone
> > this?
>=20
> I munged this to apply to my tree, the only conflicts were in
> mlme.c

Yeah, that's the ones I had too.

quoted text
> Sorry John, one of us had to deal with this :-)

John, you can always just take your version, and if I see print_mac show
up in mac80211 again then I'll send you another patch.

johannes