Hi,

Linus Walleij <linus.walleij@linaro.org> writes:
> On Tue, Jan 23, 2018 at 1:37 PM, Felipe Balbi
> <felipe.balbi@linux.intel.com> wrote:
>> Linus Walleij <linus.walleij@linaro.org> writes:
>>> On Thu, Nov 30, 2017 at 10:46 AM, Alexander Stein
>>> <alexander.stein@systec-electronic.com> wrote:
>>>> On Thursday, November 30, 2017, 10:26:55 AM CET Linus Walleij wrote:
>>>
>>>>> +     s64 timestamp;
>>>>     ^^^
>>>> u64? ktime_get_real_ns() returns u64 and struct gpioevent_data
>>>> has __u64 for timestamp.
>>>
>>> OK sorry, fixing it. Thanks for noticing!
>>
>> This is not on next. Will it miss this merge window?
>
> I realized yesterday when doing a security fix that it was missing.
>
> Because I didn't get the merge conflict I expected :D
>
> So I merged it. Don't worry. Sorry for the fuzz!

No problem, I'll refetch linux-next tomorrow or the day after and start
testing it.

Thanks

-- 
balbi