lkml.org 
[lkml]   [2019]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: PROBLEM: 5.3.0-rc* causes iwlwifi failure
On Sat, Aug 17, 2019 at 11:59:59AM +0300, Serge Belyshev wrote:
> It looks like that:
>
> commit 4fd445a2c855bbcab81fbe06d110e78dbd974a5b
> Author: Haim Dreyfuss <haim.dreyfuss@intel.com>
> Date: Thu May 2 11:45:02 2019 +0300
>
> iwlwifi: mvm: Add log information about SAR status
>
> Inform users when SAR status is changing.
>
> Signed-off-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
>
>
> is the culprit. (manually) reverting it on top of 5.3-rc4 makes
> everything work again.

Revert how?

git revert 4fd445a2c855bbcab81fbe06d110e78dbd974a5b

errors out:

warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 1583 and retry the command.
error: could not revert 4fd445a2c855... iwlwifi: mvm: Add log information about SAR status
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

Making a patch out of the commit with

git format-patch -1 4fd445a2c855bbcab81fbe06d110e78dbd974a5b

and attempting to apply the patch in reverse with

git apply -R --ignore-space-change --ignore-whitespace <patch filename>

also fails:

error: patch failed: drivers/net/wireless/intel/iwlwifi/mvm/fw.c:861
error: drivers/net/wireless/intel/iwlwifi/mvm/fw.c: patch does not apply
error: patch failed: drivers/net/wireless/intel/iwlwifi/mvm/nvm.c:620
error: drivers/net/wireless/intel/iwlwifi/mvm/nvm.c: patch does not apply

\
 
 \ /
  Last update: 2019-08-17 15:52    [W:0.135 / U:8.368 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site