Re: linux-next: build failure after merge of the hid tree

From: Jiri Kosina
Date: Wed Jun 08 2011 - 03:50:33 EST


On Wed, 8 Jun 2011, Stefan Kriwanek wrote:

> Hi Jiri,
>
> I can only guess that this has to do with my patch not made by `git
> --diff` but simply `diff -up
> /dev/null/linux-2.6.39-speedlink/drivers/hid/hid-speedlink.c`
>
> --- /dev/null 2011-05-27 13:53:55.863652998 +0200
> +++ linux-2.6.39-speedlink/drivers/hid/hid-speedlink.c 2011-05-27 18:00:34.719863577 +0200
>
> I am sorry if I caused the disturbance. However, after reading
> Documentation/SubmittitingPatches etc. I didn't know of any special
> measure to undertake when adding new files - If so, maybe one should
> consider updating the documention?.

Bah, no need to be sorry, it's my fault. Forgot to do 'git add' after I
have resolved the conflict.

Fixed now in my tree and pushed out.

--
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/