From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kalle Valo Date: Thu, 25 Apr 2013 10:56:19 +0300 Subject: [ath9k-devel] [PATCH v2 0/6] ath10k: pci cleanup In-Reply-To: <5178DD1A.10908@tieto.com> (Michal Kazior's message of "Thu, 25 Apr 2013 09:36:58 +0200") 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> <5178DD1A.10908@tieto.com> Message-ID: <87bo93vyak.fsf@kamboji.qca.qualcomm.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org Michal Kazior writes: >> 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 Ok, so you don't use 'git format-patch' at all? I wonder if that makes the difference here. I would assume not. > I also rebase against your github/master branch. What commands do you use to rebase? Have you verified that there are no private commits, eg. merges? -- Kalle Valo