* linux-next: manual merge of the iommu tree with the kernel-doc tree
@ 2009-03-19 7:57 Stephen Rothwell
2009-03-19 8:02 ` Ingo Molnar
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2009-03-19 7:57 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Joerg Roedel, Randy Dunlap
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]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the iommu tree with the kernel-doc tree
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
0 siblings, 1 reply; 7+ messages in thread
From: Ingo Molnar @ 2009-03-19 8:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Joerg Roedel, Randy Dunlap
* 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the iommu tree with the kernel-doc tree
2009-03-19 8:02 ` Ingo Molnar
@ 2009-03-19 16:14 ` Randy Dunlap
2009-03-19 16:23 ` Ingo Molnar
0 siblings, 1 reply; 7+ messages in thread
From: Randy Dunlap @ 2009-03-19 16:14 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Stephen Rothwell, linux-next, Joerg Roedel
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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the iommu tree with the kernel-doc tree
2009-03-19 16:14 ` Randy Dunlap
@ 2009-03-19 16:23 ` Ingo Molnar
2009-03-19 16:27 ` Randy Dunlap
0 siblings, 1 reply; 7+ messages in thread
From: Ingo Molnar @ 2009-03-19 16:23 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, Joerg Roedel
* 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the iommu tree with the kernel-doc tree
2009-03-19 16:23 ` Ingo Molnar
@ 2009-03-19 16:27 ` Randy Dunlap
2009-03-19 16:27 ` Ingo Molnar
2009-03-20 0:37 ` Stephen Rothwell
0 siblings, 2 replies; 7+ messages in thread
From: Randy Dunlap @ 2009-03-19 16:27 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Stephen Rothwell, linux-next, Joerg Roedel
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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the iommu tree with the kernel-doc tree
2009-03-19 16:27 ` Randy Dunlap
@ 2009-03-19 16:27 ` Ingo Molnar
2009-03-20 0:37 ` Stephen Rothwell
1 sibling, 0 replies; 7+ messages in thread
From: Ingo Molnar @ 2009-03-19 16:27 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, Joerg Roedel
* 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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: manual merge of the iommu tree with the kernel-doc tree
2009-03-19 16:27 ` Randy Dunlap
2009-03-19 16:27 ` Ingo Molnar
@ 2009-03-20 0:37 ` Stephen Rothwell
1 sibling, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2009-03-20 0:37 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Ingo Molnar, linux-next, Joerg Roedel
[-- 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 --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-03-20 0:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2009-03-20 0:37 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox