* Re: linux-next: net tree build failure
From: David Miller @ 2009-01-26 19:40 UTC (permalink / raw)
To: sfr; +Cc: linux-next, shemminger
In-Reply-To: <20090126193126.9f4bb227.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 Jan 2009 19:31:26 +1100
> Hi Dave,
>
> On Sun, 25 Jan 2009 21:17:55 -0800 (PST) David Miller <davem@davemloft.net> wrote:
> >
> > Ahh, I see. Can you possibly give this a try before I
> > push it out?
>
> My x86_64 allmodconfig now builds (with the two net commits restored and
> your patch applied).
Thanks so much for testing.
^ permalink raw reply
* Re: [PATCH] pppol2tp: stop using proc internals
From: David Miller @ 2009-01-27 5:10 UTC (permalink / raw)
To: gorcunov; +Cc: adobriyan, sfr, linux-next, ebiederm
In-Reply-To: <20090125084718.GC8203@localhost>
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sun, 25 Jan 2009 11:47:18 +0300
> [Alexey Dobriyan - Sun, Jan 25, 2009 at 01:00:48AM +0300]
> | [PATCH] pppol2tp: stop using proc internals
> |
> | PDE_NET usage in driver code is a sign and, indeed, switching
> | to seq_open_net/seq_release_net saves code and fixes bogus things, like
> | user triggerabble BUG_ON(!net) after maybe_get_net, and NULLifying ->private.
> |
> | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
...
> Thanks a lot Alexey! I'll fix PPPoE too.
Applied, thanks everyone.
^ permalink raw reply
* Re: [PATCH] net: pppoe - stop using proc internals
From: David Miller @ 2009-01-27 5:11 UTC (permalink / raw)
To: gorcunov; +Cc: adobriyan, linux-next, sfr, mostrows, netdev
In-Reply-To: <20090125120243.GA29167@localhost>
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sun, 25 Jan 2009 15:02:43 +0300
> Alexey Dobriyan pointed that using PDE_NET outside the
> proc code is plain bogus (thanks Alexey!). Fix it.
>
> Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Applied, thanks Cyrill.
^ permalink raw reply
* Re: new xfs git tree
From: Andrew Morton @ 2009-01-27 6:41 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: xfs, linux-next
In-Reply-To: <20090119011601.GA14708@infradead.org>
On Sun, 18 Jan 2009 20:16:01 -0500 Christoph Hellwig <hch@infradead.org> wrote:
> git://git.kernel.org/pub/scm/fs/xfs/xfs.git has all the fixes the
> have been peer-reviewed by the usual crowd, but still waiting for
> a "maintainer" to respond..
Should we include that in linux-next?
^ permalink raw reply
* Re: X200 suspend issue / linux-next: Tree for January 21
From: Pavel Machek @ 2009-01-27 14:05 UTC (permalink / raw)
To: Nico -telmich- Schottelius, Stephen Rothwell, linux-next, LKML
In-Reply-To: <20090121144420.GA20617@denkbrett.schottelius.org>
On Wed 2009-01-21 15:44:20, Nico -telmich- Schottelius wrote:
> Hello!
>
> News: The system freezes for almost a second and wakes up again!
>
> At least no crash this time!
Good.
Maybe the suspends-then-autoresumes exists in 2.6.29-rc2, too...? Can
you try disabling CONFIG_USB?
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply
* Re: linux-next: manual merge of the ide tree with the driver-core tree
From: Bartlomiej Zolnierkiewicz @ 2009-01-27 14:43 UTC (permalink / raw)
To: Greg KH; +Cc: Stephen Rothwell, linux-next, Kay Sievers
In-Reply-To: <20090126031821.GA1911@kroah.com>
On Monday 26 January 2009, Greg KH wrote:
> On Mon, Jan 26, 2009 at 12:50:11PM +1100, Stephen Rothwell wrote:
> > Hi Bartlomiej,
> >
> > Today's linux-next merge of the ide tree got a conflict in
> > drivers/ide/ide-acpi.c between commit
> > ea23519ff92f553facc0a73fe4daab852c75a306 ("ide: struct device - replace
> > bus_id with dev_name(), dev_set_name()") from the driver-core tree and
> > commit d721aa90f7ba2059b007a9c13c9fb09db99ce467 ("ide-acpi: cleanup
> > do_drive_get_GTF()") from the ide tree.
> >
> > The latter removed code that the former modified. I used the latter
> > version.
>
> Bart, you have the patch that Kay sent, is it not needed anymore?
Yeah, I just got it (if you meant fixup for IDE ACPI debug code, cause the
original patch is already in Linus' tree). You can drop it from your tree.
Thanks,
Bart
^ permalink raw reply
* Re: X200 suspend issue / linux-next: Tree for January 21
From: Rafael J. Wysocki @ 2009-01-27 15:31 UTC (permalink / raw)
To: Pavel Machek
Cc: Nico -telmich- Schottelius, Stephen Rothwell, linux-next, LKML
In-Reply-To: <20090127140558.GA24950@elf.ucw.cz>
On Tuesday 27 January 2009, Pavel Machek wrote:
> On Wed 2009-01-21 15:44:20, Nico -telmich- Schottelius wrote:
> > Hello!
> >
> > News: The system freezes for almost a second and wakes up again!
> >
> > At least no crash this time!
>
> Good.
>
> Maybe the suspends-then-autoresumes exists in 2.6.29-rc2, too...? Can
> you try disabling CONFIG_USB?
That would be http://bugzilla.kernel.org/show_bug.cgi?id=12399 , I think.
Thanks,
Rafael
^ permalink raw reply
* Re: X200 suspend issue / linux-next: Tree for January 21
From: Aristeu Rozanski @ 2009-01-27 16:15 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Pavel Machek, Nico -telmich- Schottelius, Stephen Rothwell,
linux-next, LKML
In-Reply-To: <200901271632.00026.rjw@sisk.pl>
> That would be http://bugzilla.kernel.org/show_bug.cgi?id=12399 , I think.
I tried the attached patch with the current Linus' git tree and it fixes the
issue to me.
Thanks!
--
Aristeu
^ permalink raw reply
* Re: linux-next: Tree for January 23 (kvm)
From: Andrew Morton @ 2009-01-28 9:51 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, avi, Marcelo Tosatti,
Alexander Graf
In-Reply-To: <497A29D0.2010307@oracle.com>
On Fri, 23 Jan 2009 12:34:24 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> Stephen Rothwell wrote:
> > Hi all,
> >
> > News: I will be on leave next week, so there will probably be no
> > linux-next release until Feb 2.
> >
> > Changes since 20090122:
>
>
> kvm changes cause this build error on i386:
>
> when kvm is built as module:
> ERROR: "__moddi3" [arch/x86/kvm/kvm.ko] undefined!
>
> or when kvm is built into the kernel image:
> lapic.c:(.text+0x19276): undefined reference to `__moddi3'
>
>
> I guess it's this line:
> ns = ktime_to_ns(remaining) % apic->timer.period;
>
dammit, I just spent N minutes hunting down the same thing in
the Jan 26 linux-next :(
^ permalink raw reply
* Re: linux-next: Tree for January 23 (kvm)
From: Alexander Graf @ 2009-01-28 10:20 UTC (permalink / raw)
To: Andrew Morton
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, avi,
Marcelo Tosatti
In-Reply-To: <20090128015149.791e10dd.akpm@linux-foundation.org>
On 28.01.2009, at 10:51, Andrew Morton wrote:
> On Fri, 23 Jan 2009 12:34:24 -0800 Randy Dunlap <randy.dunlap@oracle.com
> > wrote:
>
>> Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> News: I will be on leave next week, so there will probably be no
>>> linux-next release until Feb 2.
>>>
>>> Changes since 20090122:
>>
>>
>> kvm changes cause this build error on i386:
>>
>> when kvm is built as module:
>> ERROR: "__moddi3" [arch/x86/kvm/kvm.ko] undefined!
>>
>> or when kvm is built into the kernel image:
>> lapic.c:(.text+0x19276): undefined reference to `__moddi3'
>>
>>
>> I guess it's this line:
>> ns = ktime_to_ns(remaining) % apic->timer.period;
>>
>
> dammit, I just spent N minutes hunting down the same thing in
> the Jan 26 linux-next :(
>
Yeah, Clemens Foss posted a real fix on kvm@vger already.
Sorry for the fuss :-).
Alex
^ permalink raw reply
* Re: new xfs git tree
From: Felix Blyakher @ 2009-01-29 21:14 UTC (permalink / raw)
To: Andrew Morton; +Cc: Christoph Hellwig, linux-next, xfs
In-Reply-To: <20090126224130.53949fda.akpm@linux-foundation.org>
On Jan 27, 2009, at 12:41 AM, Andrew Morton wrote:
> On Sun, 18 Jan 2009 20:16:01 -0500 Christoph Hellwig <hch@infradead.org
> > wrote:
>
>> git://git.kernel.org/pub/scm/fs/xfs/xfs.git has all the fixes the
>> have been peer-reviewed by the usual crowd, but still waiting for
>> a "maintainer" to respond..
>
> Should we include that in linux-next?
As a new maintainer, I confirm that official xfs repository
git://oss.sgi.com/oss/git/xfs/xfs was synced with kernel.org
repo at one point and is being updated with the new patches
on a regular basis. AFAIK, it's up-to-date now.
Felix
^ permalink raw reply
* linux-next: kernel-doc quilte serie import failure
From: Stephen Rothwell @ 2009-02-01 22:48 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
Hi Randy,
Today's linux-next import of the kernel-doc quilt series failed like this:
Importing kernel-doc based on 2.6.29-rc2-next-20090126
fatal: Needed a single revision
Unknown BASE
Trees imported into linux-next cannot be based on linux-next itself (or
we would end up merging in old versions of other trees). I have dropped
the kernel-doc tree for today.
--
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
* linux-next: ide quilt series import failure
From: Stephen Rothwell @ 2009-02-01 22:48 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
Hi Bart,
Today's linux-next import of the ide quilt series failed like this:
ide-remove-ide_arch_intr-v2.patch
error: include/asm-m68k/ide.h: does not exist in index
include/asm-m68k has been moved by commit
49148020bcb6910ce71417bd990a5ce7017f9bd3 ("m68k,m68knommu: merge header
files") which was merged into Linus' tree on 2009-01-27.
I will drop the ide tree for today.
--
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
* linux-next: manual merge of the driver-core tree with the parisc tree
From: Stephen Rothwell @ 2009-02-02 0:11 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, James Bottomley, Kyle McMartin, linux-parisc
[-- Attachment #1: Type: text/plain, Size: 874 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got conflicts in
drivers/char/agp/parisc-agp.c, drivers/parisc/gsc.c and
drivers/parisc/sba_iommu.c between commit
a130bf34da4b64d7b289e2358530ef5d4ab27efd ("parisc: remove klist
iterators") from the parisc tree and commit
135bd8a5aeed90af407aeeede9587ee99c5606b2 ("parisc: don't touch driver
core internals") from the driver-core tree.
These two commits seem to be trying to do similar things. I have used
the versions from the parisc tree. Greg, I guess you need to check to
see if you agree and if so, then just remove the driver-core tree patch.
James, Kyle, the one thing I took from Greg's patch was the removal of
the include of linux/klist.h from drivers/char/agp/parisc-agp.c.
--
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
* linux-next: manual merge of the tip-core tree with Linus' tree
From: Stephen Rothwell @ 2009-02-02 0:46 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin
Cc: linux-next, David Daney, Yinghai Lu, Mike Travis
Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
kernel/irq/handle.c between commit
97179fd46da7ddedd18e95388130ed3e06c5a0c7 ("cpumask fallout: Initialize
irq_default_affinity earlier") from Linus' tree and commits
9594949b060efe86ecaa1a66839232a3b9800bc9 ("irq: change references from
NR_IRQS to nr_irqs") and 4a046d1754ee6ebb6f399696805ed61ea0444d4c ("x86:
arch_probe_nr_irqs") from the tip-core tree.
Just overlapping additions. I fixed it up as done in tip/master (see
below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc kernel/irq/handle.c
index 3aba8d1,375d68c..0000000
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@@ -146,8 -133,10 +145,12 @@@ int __init early_irq_init(void
int legacy_count;
int i;
+ init_irq_default_affinity();
+
+ /* initialize nr_irqs based on nr_cpu_ids */
+ arch_probe_nr_irqs();
+ printk(KERN_INFO "NR_IRQS:%d nr_irqs:%d\n", NR_IRQS, nr_irqs);
+
desc = irq_desc_legacy;
legacy_count = ARRAY_SIZE(irq_desc_legacy);
@@@ -233,8 -229,8 +243,10 @@@ int __init early_irq_init(void
int count;
int i;
+ init_irq_default_affinity();
+
+ printk(KERN_INFO "NR_IRQS:%d\n", NR_IRQS);
+
desc = irq_desc;
count = ARRAY_SIZE(irq_desc);
^ permalink raw reply
* linux-next: acpi tree build failure
From: Stephen Rothwell @ 2009-02-02 2:22 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next, Matthew Garrett, Kay Sievers, Greg KH
[-- Attachment #1: Type: text/plain, Size: 755 bytes --]
Hi Len,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/platform/x86/oqo-wmi.c: In function 'oqo_kine_init':
drivers/platform/x86/oqo-wmi.c:595: error: 'struct device' has no member named 'bus_id'
Caused by commit 03919980ad590ad5c5c181d1bd7d58513ad170bc ("platform/x86:
Add oqo-wmi driver for model 2 OQO backlight and rfkill control")
interacting with commit c44c8304353aa6da82cbf98040c6a9c254e68e1c ("driver
core: get rid of struct device's bus_id string array") from the
driver-core tree.
I have reverted the acpi tree commit above for today. Please convert its
usage of bus_id to dev_set_name().
--
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
* linux-next: manual merge of the ext4 tree with Linus' tree
From: Stephen Rothwell @ 2009-02-02 2:56 UTC (permalink / raw)
To: Theodore Tso; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 621 bytes --]
Hi Ted,
Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/ext4.h between commit 06a279d636734da32bb62dd2f7b0ade666f65d7c
("ext4: only use i_size_high for regular files") from Linus' tree and
commit eef9a6114469769465d43b1f8198ee1ae888e143 ("ext4: ignore
i_size_high for directories") from the ext4 tree.
These two commits appear to do almost the same thing. I used the version
from Linus' tree. Please either merge Linus' tree into the ext4 tree or
drop/modify the commit there.
--
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
* linux-next: manual merge of the net tree with Linus' tree
From: Stephen Rothwell @ 2009-02-02 3:13 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Sascha Hauer, Matt Waddel, Greg Ungerer
Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/net/Kconfig between commit
d4732d3c59b84bb093e11c8f755f32801b4bf86d ("m68knommu: add ColdFire M532x
to the FEC configuration options") from Linus' tree and commit
196719ecec0c526de273dcb902f0be956a193232 ("fec: Add support for Freescale
MX27") from the net tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/net/Kconfig
index 6bdfd47,0ec01e4..0000000
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -1828,11 -1828,11 +1828,11 @@@ config 68360_ENE
the Motorola 68360 processor.
config FEC
- bool "FEC ethernet controller (of ColdFire CPUs)"
- depends on M523x || M527x || M5272 || M528x || M520x || M532x
+ bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
- depends on M523x || M527x || M5272 || M528x || M520x || MACH_MX27
++ depends on M523x || M527x || M5272 || M528x || M520x || M532x || MACH_MX27
help
Say Y here if you want to use the built-in 10/100 Fast ethernet
- controller on some Motorola ColdFire processors.
+ controller on some Motorola ColdFire and Freescale i.MX processors.
config FEC2
bool "Second FEC ethernet controller (on some ColdFire CPUs)"
^ permalink raw reply
* linux-next: manual merge of the rr tree with the cpufreq tree
From: Stephen Rothwell @ 2009-02-02 4:00 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Dave Jones
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/x86/kernel/cpu/cpufreq/powernow-k8.c between commit
8ad2aedc2129f4e791dc7e2e89eabdcb2145d16c ("[CPUFREQ] checkpatch cleanups
for powernow-k8") from the cpufreq tree and commit
d58128cd5c204e6f9d2e1910f160064c15b5f19d
("cpumask:partial-revert-powernow-k8") from the rr tree.
Just simple overlapping changes. I fixed it up (used the conflicting
part from the rr tree change) and can carry the fix as necessary.
--
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
* Re: linux-next: manual merge of the driver-core tree with the parisc tree
From: Greg KH @ 2009-02-02 4:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, James Bottomley, Kyle McMartin, linux-parisc
In-Reply-To: <20090202111112.731a6816.sfr@canb.auug.org.au>
On Mon, Feb 02, 2009 at 11:11:12AM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got conflicts in
> drivers/char/agp/parisc-agp.c, drivers/parisc/gsc.c and
> drivers/parisc/sba_iommu.c between commit
> a130bf34da4b64d7b289e2358530ef5d4ab27efd ("parisc: remove klist
> iterators") from the parisc tree and commit
> 135bd8a5aeed90af407aeeede9587ee99c5606b2 ("parisc: don't touch driver
> core internals") from the driver-core tree.
>
> These two commits seem to be trying to do similar things. I have used
> the versions from the parisc tree. Greg, I guess you need to check to
> see if you agree and if so, then just remove the driver-core tree patch.
Yes, the parisc version is fine.
> James, Kyle, the one thing I took from Greg's patch was the removal of
> the include of linux/klist.h from drivers/char/agp/parisc-agp.c.
That would be good as well.
I'll fix up my tree tomorrow.
thanks,
greg k-h
^ permalink raw reply
* linux-next: manual merge of the firmware tree with the sound tree
From: Stephen Rothwell @ 2009-02-02 5:02 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Krzysztof Helt, Takashi Iwai
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
sound/isa/Kconfig between commit f6c6383502751ceb6f2f3579ad22578ca44f91f5
("ALSA: Turtle Beach Multisound Classic/Pinnacle driver") from the sound
tree and commit f2fd247da0abaa330c39922aa1f6729eff051f73 ("ALSA:
wavefront - Always use request_firmware()") from the firmware tree.
Just overlapping addition/removal. I fixed it up (see below) and can
carry the fix as necessary.
David, is the above firmware tree commit going anywhere - it has only
been in linux-next since Jan 12, but the commit is dated Aug 28 2008 ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc sound/isa/Kconfig
index 3409677,7658bcd..0000000
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@@ -406,46 -401,5 +406,36 @@@ config SND_WAVEFRON
To compile this driver as a module, choose M here: the module
will be called snd-wavefront.
- config SND_WAVEFRONT_FIRMWARE_IN_KERNEL
- bool "In-kernel firmware for Wavefront"
- depends on SND_WAVEFRONT
- default y
- help
- Say Y here to include the static firmware for FX DSP built in
- the kernel for the Wavefront driver. If you choose N here,
- you need to install the firmware files from the
- alsa-firmware package.
-
+config SND_MSND_PINNACLE
+ tristate "Turtle Beach MultiSound Pinnacle/Fiji driver"
+ depends on X86 && EXPERIMENTAL
+ select FW_LOADER
+ select SND_MPU401_UART
+ select SND_PCM
+ help
+ Say Y to include support for Turtle Beach MultiSound Pinnacle/
+ Fiji soundcards.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-msnd-pinnacle.
+
+config SND_MSND_CLASSIC
+ tristate "Support for Turtle Beach MultiSound Classic, Tahiti, Monterey"
+ depends on X86 && EXPERIMENTAL
+ select FW_LOADER
+ select SND_MPU401_UART
+ select SND_PCM
+ help
+ Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
+ Monterey (not for the Pinnacle or Fiji).
+
+ See <file:Documentation/sound/oss/MultiSound> for important information
+ about this driver. Note that it has been discontinued, but the
+ Voyetra Turtle Beach knowledge base entry for it is still available
+ at <http://www.turtlebeach.com/site/kb_ftp/790.asp>.
+
+ To compile this driver as a module, choose M here: the module
+ will be called snd-msnd-classic.
+
endif # SND_ISA
^ permalink raw reply
* Re: linux-next: manual merge of the driver-core tree with the parisc tree
From: Stephen Rothwell @ 2009-02-02 5:04 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, James Bottomley, Kyle McMartin, linux-parisc
In-Reply-To: <20090202044144.GA12243@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 707 bytes --]
Hi Greg,
On Sun, 1 Feb 2009 20:41:44 -0800 Greg KH <greg@kroah.com> wrote:
>
> > These two commits seem to be trying to do similar things. I have used
> > the versions from the parisc tree. Greg, I guess you need to check to
> > see if you agree and if so, then just remove the driver-core tree patch.
>
> Yes, the parisc version is fine.
>
> > James, Kyle, the one thing I took from Greg's patch was the removal of
> > the include of linux/klist.h from drivers/char/agp/parisc-agp.c.
>
> That would be good as well.
>
> I'll fix up my tree tomorrow.
Thanks for checking.
--
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
* linux-next: manual merge of the kmemcheck tree with the tree
From: Stephen Rothwell @ 2009-02-02 6:13 UTC (permalink / raw)
To: Vegard Nossum, Pekka Enberg, Ingo Molnar; +Cc: linux-next, Nick Piggin
Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
mm/Makefile between commit 32efb35b328d0e87fa5358239c54c889226cc6e7
("SLQB slab allocator (try 2)") from the slab tree and commit
e6df1035b1b488cafde1e69f1a25f2706c3ac1f7 ("kmemcheck: add mm functions")
from the kmemcheck tree.
Just trivial overlapping additions. 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 mm/Makefile
index 658ba14,1d353e3..0000000
--- a/mm/Makefile
+++ b/mm/Makefile
@@@ -26,7 -26,7 +26,8 @@@ obj-$(CONFIG_SLOB) += slob.
obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o
obj-$(CONFIG_SLAB) += slab.o
obj-$(CONFIG_SLUB) += slub.o
+obj-$(CONFIG_SLQB) += slqb.o
+ obj-$(CONFIG_KMEMCHECK) += kmemcheck.o
obj-$(CONFIG_FAILSLAB) += failslab.o
obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o
obj-$(CONFIG_FS_XIP) += filemap_xip.o
^ permalink raw reply
* linux-next: sparseirq tree build warning
From: Stephen Rothwell @ 2009-02-02 6:48 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Yinghai Lu
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
Hi Ingo,
Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
arch/powerpc/platforms/cell/interrupt.c: In function 'handle_iic_irq':
arch/powerpc/platforms/cell/interrupt.c:240: warning: unused variable 'cpu'
Caused by commit dee4102a9a5882b4f7d5cc165ba29e8cc63cf92e ("sparseirq:
use kstat_irqs_cpu instead").
--
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
* linux-next: manual merge of the kmemleak tree with the slab tree
From: Stephen Rothwell @ 2009-02-02 7:53 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-next, Nick Piggin, Pekka Enberg, Christoph Lameter
Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in
lib/Kconfig.debug between commit 32efb35b328d0e87fa5358239c54c889226cc6e7
("SLQB slab allocator (try 2)") from the slab tree and commits
de190b3e003e07f501a3e6fc67a997b66c144bcb ("kmemleak: Enable the building
of the memory leak detector") and
6b9fe2865daff5d4e6d272addc03768b4ffcec36 ("kmemleak: Simple testing
module for kmemleak") from the kmemleak tree.
Just overlapping additions. 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 lib/Kconfig.debug
index da4d89a,612ed9c..0000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -336,26 -298,39 +336,59 @@@ config SLUB_STAT
out which slabs are relevant to a particular load.
Try running: slabinfo -DA
+config SLQB_DEBUG
+ default y
+ bool "Enable SLQB debugging support"
+ depends on SLQB
+
+config SLQB_DEBUG_ON
+ default n
+ bool "SLQB debugging on by default"
+ depends on SLQB_DEBUG
+
+config SLQB_SYSFS
+ bool "Create SYSFS entries for slab caches"
+ default n
+ depends on SLQB
+
+config SLQB_STATS
+ bool "Enable SLQB performance statistics"
+ default n
+ depends on SLQB_SYSFS
+
+ config DEBUG_KMEMLEAK
+ bool "Kernel memory leak detector"
+ default n
+ depends on EXPERIMENTAL && (X86 || ARM)
+ select DEBUG_SLAB if SLAB
+ select SLUB_DEBUG if SLUB
+ select DEBUG_FS if SYSFS
+ select STACKTRACE if STACKTRACE_SUPPORT
+ select KALLSYMS
+ help
+ Say Y here if you want to enable the memory leak
+ detector. The memory allocation/freeing is traced in a way
+ similar to the Boehm's conservative garbage collector, the
+ difference being that the orphan objects are not freed but
+ only shown in /sys/kernel/debug/kmemleak. Enabling this
+ feature will introduce an overhead to memory
+ allocations. See Documentation/kmemleak.txt for more
+ details.
+
+ In order to access the kmemleak file, debugfs needs to be
+ mounted (usually at /sys/kernel/debug).
+
+ config DEBUG_KMEMLEAK_TEST
+ tristate "Simple test for the kernel memory leak detector"
+ default n
+ depends on DEBUG_KMEMLEAK
+ help
+ Say Y or M here to build a test for the kernel memory leak
+ detector. This option enables a module that explicitly leaks
+ memory.
+
+ If unsure, say N.
+
config DEBUG_PREEMPT
bool "Debug preemptible kernel"
depends on DEBUG_KERNEL && PREEMPT && (TRACE_IRQFLAGS_SUPPORT || PPC64)
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox