Subject: Re: linux-next: manual merge of the iommu tree with the kernel-doc tree

From: Ingo Molnar <[email-masked]>
Date: Thu, 19 Mar 2009 17:23:22 +0100

* Randy Dunlap <[email-masked]> wrote:

> Ingo Molnar wrote:
> > * Stephen Rothwell <[email-masked]> 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 <[email-masked]>
> >   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.

	Ingo