From: Jacek Anaszewski <jacek.anaszewski@gmail.com>
To: Heiner Kallweit <hkallweit1@gmail.com>,
Jacek Anaszewski <j.anaszewski@samsung.com>
Cc: linux-leds@vger.kernel.org
Subject: Re: [PATCH] leds: core: avoid error message when a USB LED device is unplugged
Date: Fri, 22 Jan 2016 23:03:45 +0100 [thread overview]
Message-ID: <56A2A741.5040102@gmail.com> (raw)
In-Reply-To: <56A293A5.9020503@gmail.com>
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
prev parent reply other threads:[~2016-01-22 22:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 20:42 [PATCH] leds: core: avoid error message when a USB LED device is unplugged Heiner Kallweit
2016-01-22 8:45 ` Jacek Anaszewski
2016-01-22 20:40 ` Heiner Kallweit
2016-01-22 22:03 ` Jacek Anaszewski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56A2A741.5040102@gmail.com \
--to=jacek.anaszewski@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=j.anaszewski@samsung.com \
--cc=linux-leds@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).