[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <7d16caee-e605-d80b-6638-3ada4dbc4f67@infradead.org>
Date: Tue, 5 Apr 2022 12:06:40 -0700
From: Randy Dunlap <rdunlap@...radead.org>
To: Simon Ser <contact@...rsion.fr>
Cc: Javier Martinez Canillas <javierm@...hat.com>,
linux-kernel@...r.kernel.org,
Thomas Zimmermann <tzimmermann@...e.de>,
David Airlie <airlied@...ux.ie>,
dri-devel@...ts.freedesktop.org
Subject: Re: [PATCH] drm/format_helper: fix a kernel-doc typo
On 4/5/22 11:47, Simon Ser wrote:
> On Tuesday, April 5th, 2022 at 19:58, Randy Dunlap <rdunlap@...radead.org> wrote:
>
>> On 4/5/22 08:05, Simon Ser wrote:
>>
>>> On Tuesday, April 5th, 2022 at 16:39, Randy Dunlap rdunlap@...radead.org wrote:
>>>
>>>> On 4/4/22 23:26, Javier Martinez Canillas wrote:
>>>>
>>>>> On 4/5/22 08:12, Simon Ser wrote:
>>>>>
>>>>>> On Monday, April 4th, 2022 at 23:35, Randy Dunlap rdunlap@...radead.org wrote:
>>>>>>
>>>>>>> On 4/4/22 09:04, Simon Ser wrote:
>>>>>>>
>>>>>>>> Both doc patches pushed, thanks. I had to manually edit them because they
>>>>>>>> wouldn't apply cleanly. Next time, please use git-send-email (see
>>>>>>>> https://git-send-email.io/ for setup instructions).
>>>>>>>
>>>>>>> That's odd. I did use 'git send-email' and I don't usually have any
>>>>>>> problems (AFAIK). I'll check those setup instructions.
>>>>>>
>>>>>> Hm, maybe the issue isn't git-send-email, but the way the patch was
>>>>>> generated? I had to manually edit these lines for the first patch to work:
>>>>>>
>>>>>> --- linux-next-20211217.orig/include/drm/drm_file.h
>>>>>> +++ linux-next-20211217/include/drm/drm_file.h
>>>>>>
>>>>>> I changed these to:
>>>>>>
>>>>>> --- a/include/drm/drm_file.h
>>>>>> +++ b/include/drm/drm_file.h
>>
>>
>> quilt (which I am using) can generate a/ b/ patches instead of linux.orig/ and
>> linux/ patches.
>>
>>>>>> This wasn't enough for the second patch, I had to re-do the changes by hand
>>>>>> from scratch.
>>
>>
>> I would like more information about this one if it's not too much trouble
>> for you.
>
> IIRC it was the usual git-am error "fatal: sha1 information is lacking
> or useless". Maybe you wrote the patch for an old tree and drm-misc-next
> contained changes near the lines you changed? Maybe providing base-commit
> information in the patch would've helped? I'm not sure.
OK, thanks Simon.
--
~Randy
Powered by blists - more mailing lists