On 01/22/2016 09:40 PM, Heiner Kallweit wrote:
Am 22.01.2016 um 09:45 schrieb Jacek Anaszewski:
Hi Heiner,
Could you rebase this patch on the top of devel branch
of LED git, please?
I am getting an error while applying it:
error: short SHA1 19e1e60 is ambiguous.
fatal: sha1 information is lacking or useless (drivers/leds/led-core.c).
Repository lacks necessary blobs to fall back on 3-way merge.
It may have happened that you had some patches that are not in mainline
kernel in the repository you produced the patch from. It is also
possible that this is an issue with the git version I am using, so this
would clarify the situation.
Reason is the changed comment as it affects the context of this patch.
Will rebase it and resend.
Changed comment should only result in a conflict. This was not
the case, the crucial line was:
error: short SHA1 19e1e60 is ambiguous
It occurs also with git 2.1.4. Nevertheless, version 2 applies
smoothly.
Thanks,
Jacek Anaszewski
--
To unsubscribe from this list: send the line "unsubscribe linux-leds" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
