All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: "Grumbach, Emmanuel" <emmanuel.grumbach@intel.com>,
	Kalle Valo <kvalo@codeaurora.org>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
Subject: Re: pull request: iwlwifi 2016-01-26
Date: Tue, 26 Jan 2016 15:01:29 +0100	[thread overview]
Message-ID: <1453816889.2759.72.camel@sipsolutions.net> (raw)
In-Reply-To: <0BA3FCBA62E2DC44AF3030971E174FB32E9D570C@hasmsx109.ger.corp.intel.com> (sfid-20160126_145757_359075_F35650DF)


> > There's a conflict due to 8f57e4d930d, how should I fix it?

I think we can thus drop my patch - that commit fixes the issue that
Andrew had reported as well, and that I worked around by casting the
result... now that abs() has a consistent result, using s32 in both
sides of the min() is perfectly fine.

johannes


  reply	other threads:[~2016-01-26 14:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-26 10:19 pull request: iwlwifi 2016-01-26 Grumbach, Emmanuel
2016-01-26 10:21 ` [PATCH 1/5] iwlwifi: add new 3168 series devices support Emmanuel Grumbach
2016-01-26 10:21 ` [PATCH 2/5] iwlwifi: add device ID for 8265 Emmanuel Grumbach
2016-01-26 10:21 ` [PATCH 3/5] iwlwifi: dvm: calib.c: fix min() warning Emmanuel Grumbach
2016-01-26 10:21 ` [PATCH 4/5] iwlwifi: update support for 3168 series firmware and NVM Emmanuel Grumbach
2016-01-26 10:21 ` [PATCH 5/5] iwlwifi: mvm: rs: fix TPC statistics handling Emmanuel Grumbach
2016-01-26 13:50 ` pull request: iwlwifi 2016-01-26 Kalle Valo
2016-01-26 13:57   ` Grumbach, Emmanuel
2016-01-26 14:01     ` Johannes Berg [this message]
2016-01-26 14:05       ` Grumbach, Emmanuel
2016-01-27 12:20         ` Kalle Valo

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=1453816889.2759.72.camel@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=emmanuel.grumbach@intel.com \
    --cc=kvalo@codeaurora.org \
    --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.