[ath9k-devel] [PATCH v3 1/6] ath10k: fix pci_set_drvpriv ordering

[Michal Kazior <michal.kazior@tieto.com>]

On 26/04/13 08:45, Kalle Valo wrote:
> Michal Kazior <michal.kazior@tieto.com> writes:
>
>> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
>> ---
>>   drivers/net/wireless/ath/ath10k/pci.c |    4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
>> index 2e4e85b..14197ec 100644
>> --- a/drivers/net/wireless/ath/ath10k/pci.c
>> +++ b/drivers/net/wireless/ath/ath10k/pci.c
>
> I have been trying to understand why 3-way merge doesn't work with your
> patches, but I just don't get it. The object id seems to be valid as
> this works for me:
>
> $ git show 2e4e85b | head -3
> /*
>   * Copyright (c) 2005-2011 Atheros Communications Inc.
>   * Copyright (c) 2011-2013 Qualcomm Atheros, Inc.
>
> So does git-am fail when parsing the email or what? Next I tried to
> compare your and Bartosz' emails and I didn't find anything which would
> explain the problem. The only difference I was able to find was that
> Bartosz uses git 1.7.10 and you use 1.7.9.5, but that shouldn't make any
> difference as the patch looks ok otherwise.
>
> FWIW, I use git 1.7.9.5 from Ubuntu 12.04 64 bit.
>
> Quite a problem we have :/

Perhaps this has something to do with newline style? \n vs \r\n ?



-- Pozdrawiam / Best regards, Michal Kazior.