"Grumbach, Emmanuel" <emmanuel.grumbach@xxxxxxxxx> writes:
> This is the first round of fixes for 4.5. Most of them are really
> trivial. The TPC stats one stands out a little bit. It can fix traffic
> issues which are typically hard to debug. Please pull and let me know
> if you have issues.
There's a conflict due to 8f57e4d930d, how should I fix it?
diff --cc drivers/net/wireless/intel/iwlwifi/dvm/calib.c
index e9cef9de9ed8,14949efc4a35..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/dvm/calib.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c
@@@ -900,8 -900,8 +900,13 @@@ static void iwlagn_gain_computation(str
/* bound gain by 2 bits value max, 3rd bit is sign */
data->delta_gain_code[i] =
++<<<<<<< HEAD
+ min(abs(delta_g),
+ (s32) CHAIN_NOISE_MAX_DELTA_GAIN_CODE);
++=======
+ min_t(u8, abs(delta_g),
+ CHAIN_NOISE_MAX_DELTA_GAIN_CODE);
++>>>>>>> c3653efc57d9b3c51ee657a471578d2493b6e3f0
if (delta_g < 0)
/*
> I also have a batch of patches for -next, but
> wireless-drivers-next.git doesn't seem ready to accept new patches at
> this stage.
I'll open wireless-drivers-next once net-next is open, but AFAIK Dave
hasn't opened it yet.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
