From: Randy Dunlap <randy.dunlap@oracle•com>
To: Ingo Molnar <mingo@elte•hu>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, Joerg Roedel <joerg.roedel@amd•com>
Subject: Re: linux-next: manual merge of the iommu tree with the kernel-doc tree
Date: Thu, 19 Mar 2009 09:27:14 -0700 [thread overview]
Message-ID: <49C27262.4050405@oracle.com> (raw)
In-Reply-To: <20090319162322.GA18465@elte.hu>
Ingo Molnar wrote:
> * Randy Dunlap <randy.dunlap@oracle•com> wrote:
>
>> Ingo Molnar wrote:
>>> * Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>>>
>>>> Hi Ingo,
>>>>
>>>> Today's linux-next merge of the iommu tree got a conflict in
>>>> Documentation/kernel-parameters.txt between commit
>>>> 8e141e0b33e2fd17540881a1ead5103dd229bf81 ("docum-kernprms-alpha3") from
>>>> the kernel-doc tree and commit 59d3daafa17265f01149df8eab3fb69b9b42cb2e
>>>> ("dma-debug: add kernel command line parameters") from the iommu tree.
>>> a sidenote for Randy, the commit title looks weird:
>>>
>>> From 8e141e0b33e2fd17540881a1ead5103dd229bf81 Mon Sep 17 00:00:00 2001
>>> From: Randy Dunlap <randy.dunlap@oracle•com>
>>> Date: Tue, 24 Feb 2009 11:11:44 +1100
>>> Subject: [PATCH] docum-kernprms-alpha3
>>>
>>> this is not really acceptable for upstream.
>> Yes, I agree.
>>
>> Stephen, that's just the filename (with .patch) from the quilt
>> series file, right? I could expand the filename... are there
>> any other options here?
>
> If you put a "Subject: " line into the .patch that should get
> imported as the commit title.
OK, I'll give that a shot. Thanks.
--
~Randy
next prev parent reply other threads:[~2009-03-19 16:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-19 7:57 linux-next: manual merge of the iommu tree with the kernel-doc tree Stephen Rothwell
2009-03-19 8:02 ` Ingo Molnar
2009-03-19 16:14 ` Randy Dunlap
2009-03-19 16:23 ` Ingo Molnar
2009-03-19 16:27 ` Randy Dunlap [this message]
2009-03-19 16:27 ` Ingo Molnar
2009-03-20 0:37 ` Stephen Rothwell
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=49C27262.4050405@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=joerg.roedel@amd$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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