netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
To: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org,
	netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH/RFC] mac80211: convert to %pM away from print_mac
Date: Mon, 27 Oct 2008 19:25:19 -0400	[thread overview]
Message-ID: <20081027232518.GK20389@tuxdriver.com> (raw)
In-Reply-To: <20081027.155243.206513005.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>

On Mon, Oct 27, 2008 at 03:52:43PM -0700, David Miller wrote:
> From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
> Date: Sat, 25 Oct 2008 01:50:43 +0200
> 
> > Also remove a few stray DECLARE_MAC_BUF that were no longer
> > used at all.
> > 
> > Signed-off-by: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
> > ---
> > Not sure this will apply to your tree, I prepared it against John's tree
> > 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 in
> > yours which he normally doesn't... No idea. I can also just postpone
> > this?
> 
> I munged this to apply to my tree, the only conflicts were in
> mlme.c
> 
> Sorry John, one of us had to deal with this :-)

No, this seems fine to me.  I'll try to stay aware of it for possible
merge conflicts...

John
-- 
John W. Linville		Linux should be at the core
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org			of your literate lifestyle.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2008-10-27 23:25 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-24 23:50 [PATCH/RFC] mac80211: convert to %pM away from print_mac Johannes Berg
2008-10-27 22:52 ` David Miller
     [not found]   ` <20081027.155243.206513005.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2008-10-27 23:25     ` John W. Linville [this message]
2008-10-28  8:07     ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081027232518.GK20389@tuxdriver.com \
    --to=linville-2xusbdqka4r54taoqtywwq@public.gmane.org \
    --cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
    --cc=johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org \
    --cc=linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).