From: Randy Dunlap <rdunlap@infradead.org>
To: Simon Ser <contact@emersion.fr>
Cc: Javier Martinez Canillas <javierm@redhat.com>,
linux-kernel@vger.kernel.org,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/format_helper: fix a kernel-doc typo
Date: Tue, 5 Apr 2022 12:06:40 -0700 [thread overview]
Message-ID: <7d16caee-e605-d80b-6638-3ada4dbc4f67@infradead.org> (raw)
In-Reply-To: <zO0fTUWc0nKMy-cwUaONpM1AHlfPoNe77IooCuHLEYiowkM165XiiuM2JGASUQrOFcvNMVSGUwETeF7JAIf40r84dwNvh_Gl1MF_ZXYOHWE=@emersion.fr>
On 4/5/22 11:47, Simon Ser wrote:
> On Tuesday, April 5th, 2022 at 19:58, Randy Dunlap <rdunlap@infradead.org> wrote:
>
>> On 4/5/22 08:05, Simon Ser wrote:
>>
>>> On Tuesday, April 5th, 2022 at 16:39, Randy Dunlap rdunlap@infradead.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@infradead.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
prev parent reply other threads:[~2022-04-05 21:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-03 23:29 Randy Dunlap
2022-04-04 8:45 ` Simon Ser
2022-04-04 15:51 ` Javier Martinez Canillas
2022-04-04 16:04 ` Simon Ser
2022-04-04 21:35 ` Randy Dunlap
2022-04-05 6:12 ` Simon Ser
2022-04-05 6:26 ` Javier Martinez Canillas
2022-04-05 14:39 ` Randy Dunlap
2022-04-05 15:05 ` Simon Ser
2022-04-05 17:58 ` Randy Dunlap
2022-04-05 18:47 ` Simon Ser
2022-04-05 19:06 ` Randy Dunlap [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=7d16caee-e605-d80b-6638-3ada4dbc4f67@infradead.org \
--to=rdunlap@infradead.org \
--cc=airlied@linux.ie \
--cc=contact@emersion.fr \
--cc=dri-devel@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tzimmermann@suse.de \
/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
all inboxes | Powered by JetHome®