Return-path: Received: from mail-wg0-f42.google.com ([74.125.82.42]:50478 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753099AbbAOMiE convert rfc822-to-8bit (ORCPT ); Thu, 15 Jan 2015 07:38:04 -0500 Received: by mail-wg0-f42.google.com with SMTP id k14so14656803wgh.1 for ; Thu, 15 Jan 2015 04:38:02 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <87k30oxpt5.fsf@kamboji.qca.qualcomm.com> References: <1420715897-18706-1-git-send-email-michal.kazior@tieto.com> <87k30oxpt5.fsf@kamboji.qca.qualcomm.com> Date: Thu, 15 Jan 2015 13:38:02 +0100 Message-ID: (sfid-20150115_133812_791768_C835A02E) Subject: Re: [PATCH 0/2] ath10k: add wmi-tlv debug event handling From: Michal Kazior To: Kalle Valo Cc: "ath10k@lists.infradead.org" , linux-wireless Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 15 January 2015 at 12:10, Kalle Valo wrote: [...] > Applying: ath10k: implement diag data container event > Using index info to reconstruct a base tree... > Falling back to patching base and 3-way merge... > Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.h > CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h > Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.c > CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c > Failed to merge in the changes. > Patch failed at 0001 ath10k: implement diag data container event > > Please double check my conflict resolution in ath-next-test. Looks good, thanks! Michał