From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michal Kazior <michal.kazior@tieto.com>
Date: Thu, 25 Apr 2013 09:36:58 +0200
Subject: [ath9k-devel] [PATCH v2 0/6] ath10k: pci cleanup
In-Reply-To: <87k3nrvzs7.fsf@kamboji.qca.qualcomm.com>
References: <1366798800-22300-1-git-send-email-michal.kazior@tieto.com>
	<1366806393-2465-1-git-send-email-michal.kazior@tieto.com>
	<87k3nrvzs7.fsf@kamboji.qca.qualcomm.com>
Message-ID: <5178DD1A.10908@tieto.com>
List-Id: <ath9k-devel.lists.ath9k.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: ath9k-devel@lists.ath9k.org

On 25/04/13 09:24, Kalle Valo wrote:
> Michal Kazior <michal.kazior@tieto.com> writes:
>
>> This gets rid of the ugly device/target resetting
>> retries. It also tries to simplify pci probing
>> logic.
>>
>> v2: fixes MSI-X and legacy interrupts
>>      adds/changes a few prints
>>
>> Michal Kazior (6):
>>    ath10k: fix pci_set_drvpriv ordering
>>    ath10k: refactor pci interrupt functions
>>    ath10k: remove pci probe retrying
>>    ath10k: remove ath10k_pci_configure()
>>    ath10k: remove ath10k_pci_probe_device()
>>    ath10k: simplify pci target reset
>
> Applying: ath10k: remove pci probe retrying
> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/pci.c).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0003 ath10k: remove pci probe retrying
>
> I didn't want to start manually fixing the conflict, so can you please
> rebase? And please double check how you submit patches, git still
> complains about invalid ids. Of course it might be something on my end,
> but your patches are the only ones with which I have noticed this
> problem.

I've made sure to send the v2 with no private patches around. When 
rebasing I had to resolve the conflict on this patch myself too. It was 
in conflict with the hif_type variable removal.

I use this command:

	git send-email --annotate --cover-letter [--subject-prefix=..] 
[--in-reply-to=..] commit_id..commit_id

I also rebase against your github/master branch.



-- Pozdrawiam / Best regards, Michal Kazior.