From: "John W. Linville" <linville@tuxdriver.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH] iwlwifi: pcie: fix merge damage
Date: Mon, 30 Sep 2013 16:32:06 -0400 [thread overview]
Message-ID: <20130930203206.GM10994@tuxdriver.com> (raw)
In-Reply-To: <1380532074.14467.2.camel@jlt4.sipsolutions.net>
On Mon, Sep 30, 2013 at 11:07:54AM +0200, Johannes Berg wrote:
> On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote:
> > From: Johannes Berg <johannes.berg@intel.com>
> >
> > The merge b35c8097 seems to have lost commit eabc4ac5d,
> > put the code back.
> >
> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>
> Ah, forgot to say - John, I think you should apply this as a patch,
> having it in my pull request seems odd. But if you're of another opinion
> I can stick it into my next -next pull request too.
OK -- does this need to be treated as a fix? Or is -next OK?
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2013-09-30 20:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-30 9:02 [PATCH] iwlwifi: pcie: fix merge damage Johannes Berg
2013-09-30 9:07 ` Johannes Berg
2013-09-30 20:32 ` John W. Linville [this message]
2013-10-01 7:28 ` Johannes Berg
2013-10-03 10:07 ` Sedat Dilek
2013-10-07 11:47 ` Johannes Berg
2013-10-02 9:41 ` Johannes Berg
2013-10-02 18:50 ` John W. Linville
2013-10-02 18:58 ` John W. Linville
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=20130930203206.GM10994@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.