[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87shxg4nj1.fsf@kamboji.qca.qualcomm.com>
Date: Tue, 17 May 2016 20:12:02 +0300
From: Kalle Valo <kvalo@...eaurora.org>
To: David Miller <davem@...emloft.net>
Cc: linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
luciano.coelho@...el.com, emmanuel.grumbach@...el.com
Subject: Re: pull-request: wireless-drivers-next 2016-05-13
David Miller <davem@...emloft.net> writes:
> From: Kalle Valo <kvalo@...eaurora.org>
> Date: Tue, 17 May 2016 09:43:34 +0300
>
>> I noticed that you had marked this as Superseded in pathwork[1]. I was
>> actually hoping that you would pull this with the instructions how to
>> fix the conflict. But do you actually want me to resubmit the pull
>> request? Or something else?
>>
>> [1] https://patchwork.ozlabs.org/patch/621953/
>
> My impression is that you need to make adjustments to fix the merge error
> I made the other day, and that a new pull request would show up with that
> corrected.
Ok, I'll send a new pull request.
> There is no rush, whenever you submit it I'll still take it.
Thanks for understanding and sorry for the mess.
--
Kalle Valo
Powered by blists - more mailing lists