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

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

[Stephen Rothwell]

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.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc Documentation/kernel-parameters.txt
index 114e162,0fa3c05..0000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -608,12 -684,8 +608,22 @@@ and is between 256 and 4096 characters
  			MTRR settings.  This parameter disables that behavior,
  			possibly causing your machine to run very slowly.
  
 +	disable_timer_pin_1 [i386,x86-64]
 +			Disable PIN 1 of APIC timer
 +			Can be useful to work around chipset bugs.
 +
  	dmasound=	[HW,OSS] Sound subsystem buffers
  
++	dma_debug=off	If the kernel is compiled with DMA_API_DEBUG support
++			this option disables the debugging code at boot.
++
++	dma_debug_entries=<number>
++			This option allows to tune the number of preallocated
++			entries for DMA-API debugging code. One entry is
++			required per DMA-API allocation. Use this if the
++			DMA-API debugging code disables itself because the
++			architectural default is too low.
++
  	dscc4.setup=	[NET]
  
  	dtc3181e=	[HW,SCSI]

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

[Ingo Molnar]

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

	Ingo

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

[Randy Dunlap]

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?

Thanks.
-- 
~Randy

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

[Ingo Molnar]

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

	Ingo

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

[Ingo Molnar]

* 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

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

[Randy Dunlap]

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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

Hi Randy,

On Thu, 19 Mar 2009 09:27:14 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> Ingo Molnar wrote:
> > 
> > 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 looks much better, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]