All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Randy Dunlap <randy.dunlap@oracle.com>
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 17:27:01 +0100	[thread overview]
Message-ID: <20090319162701.GA20549@elte.hu> (raw)
In-Reply-To: <49C27262.4050405@oracle.com>


* Randy Dunlap <randy.dunlap@oracle.com> wrote:

> 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.

That will be useful in any case, when you submit it upstream. 
Another option is to put it into a Git tree straight away :-)

	Ingo

  reply	other threads:[~2009-03-19 16:27 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
2009-03-19 16:27         ` Ingo Molnar [this message]
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=20090319162701.GA20549@elte.hu \
    --to=mingo@elte.hu \
    --cc=joerg.roedel@amd.com \
    --cc=linux-next@vger.kernel.org \
    --cc=randy.dunlap@oracle.com \
    --cc=sfr@canb.auug.org.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.