Re: [PATCH] iwlwifi: pcie: fix merge damage
From: John W. Linville <hidden>
Date: 2013-09-30 20:45:19
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:quoted
From: Johannes Berg <redacted> The merge b35c8097 seems to have lost commit eabc4ac5d, put the code back. Signed-off-by: Johannes Berg <redacted>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.