* Re: IDE -next tree
From: Stephen Rothwell @ 2009-08-08 15:57 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-ide
In-Reply-To: <20090808.054512.37246834.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 575 bytes --]
Hi Dave,
On Sat, 08 Aug 2009 05:45:12 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sat, 8 Aug 2009 14:41:40 +1000
>
> >
> > So does that mean that the current ide tree
> > (master.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git) should
> > become ide-current (i.e. it contains bug fixes for the current release)?
>
> That's right.
OK, it will be that way starting on Monday.
--
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: IDE -next tree
From: David Miller @ 2009-08-08 12:45 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-ide
In-Reply-To: <20090808144140.10e4f2e9.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 8 Aug 2009 14:41:40 +1000
> On Fri, 07 Aug 2009 21:37:13 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>>
>> Stephen, please add:
>>
>> master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-next-2.6.git
>>
>> to your -next tree.
>
> So does that mean that the current ide tree
> (master.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git) should
> become ide-current (i.e. it contains bug fixes for the current release)?
That's right.
^ permalink raw reply
* Re: IDE -next tree
From: Stephen Rothwell @ 2009-08-08 4:41 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-ide
In-Reply-To: <20090807.213713.259828836.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi Dave,
On Fri, 07 Aug 2009 21:37:13 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Stephen, please add:
>
> master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-next-2.6.git
>
> to your -next tree.
So does that mean that the current ide tree
(master.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git) should
become ide-current (i.e. it contains bug fixes for the current release)?
Or should I just drop it?
--
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
* IDE -next tree
From: David Miller @ 2009-08-08 4:37 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-ide
Stephen, please add:
master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-next-2.6.git
to your -next tree.
Thanks!
^ permalink raw reply
* Re: linux-next: manual merge of the trivial tree with the tree
From: Stephen Rothwell @ 2009-08-08 0:46 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Joe Perches, Andrew Morton,
Markus Heidelberg
In-Reply-To: <alpine.LNX.2.00.0908080212320.25797@wotan.suse.de>
[-- Attachment #1: Type: text/plain, Size: 462 bytes --]
Hi Jiri,
On Sat, 8 Aug 2009 02:13:36 +0200 (CEST) Jiri Kosina <jkosina@suse.cz> wrote:
>
> [ sorry for late reply, have been on vacation, totally offline, for two
> weeks ]
Hey, no worries :-)
> I have fast-forwarded the 'for-next' branch of trivial tree and fixed the
> conflict, so it should be OK the next time you pull.
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
* Re: linux-next: manual merge of the trivial tree with the tree
From: Jiri Kosina @ 2009-08-08 0:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Joe Perches, Andrew Morton,
Markus Heidelberg
In-Reply-To: <20090731143912.7a6afdbb.sfr@canb.auug.org.au>
On Fri, 31 Jul 2009, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> MAINTAINERS between commit 24725d1ecf26ba05d74c1cc3ae7467b61a900421
> ("MAINTAINERS: Update KERNEL JANITORS") from Linus' tree and commit
> 70301b8cc8a23d57d3e6120c012c86569285efcb ("trivial: update the Kernel
> Janitors' web-page URL") from the trivial tree.
>
> Just context differences. I fixed it up (see below) and can carry the
> fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc MAINTAINERS
> index fa86fd5,354cc16..0000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -2912,13 -3374,16 +2912,13 @@@ F: Makefil
> F: scripts/Makefile.*
>
> KERNEL JANITORS
> -P: Several
> L: kernel-janitors@vger.kernel.org
> - W: http://www.kerneljanitors.org/
> + W: http://janitor.kernelnewbies.org/
> -S: Maintained
> +S: Odd fixes
>
> KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
> -P: J. Bruce Fields
> -M: bfields@fieldses.org
> -P: Neil Brown
> -M: neilb@suse.de
> +M: "J. Bruce Fields" <bfields@fieldses.org>
> +M: Neil Brown <neilb@suse.de>
> L: linux-nfs@vger.kernel.org
> W: http://nfs.sourceforge.net/
> S: Supported
[ sorry for late reply, have been on vacation, totally offline, for two
weeks ]
I have fast-forwarded the 'for-next' branch of trivial tree and fixed the
conflict, so it should be OK the next time you pull.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* [PATCH -next] watchdog: fix wdt_pci printk and variable type
From: Randy Dunlap @ 2009-08-07 22:02 UTC (permalink / raw)
To: Stephen Rothwell, akpm; +Cc: linux-next, LKML, Wim Van Sebroeck
In-Reply-To: <20090807183118.e71b4db2.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix printk format warning:
drivers/watchdog/wdt_pci.c:652: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'resource_size_t'
and then use resource_size_t for the "io" variable as well
so that it won't be truncated.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
---
drivers/watchdog/wdt_pci.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- linux-next-20090807.orig/drivers/watchdog/wdt_pci.c
+++ linux-next-20090807/drivers/watchdog/wdt_pci.c
@@ -80,7 +80,7 @@ static unsigned long open_lock;
static DEFINE_SPINLOCK(wdtpci_lock);
static char expect_close;
-static int io;
+static resource_size_t io;
static int irq;
/* Default timeout */
@@ -648,8 +648,8 @@ static int __devinit wdtpci_init_one(str
}
if (pci_request_region(dev, 2, "wdt_pci")) {
- printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
- pci_resource_start(dev, 2));
+ printk(KERN_ERR PFX "I/O address 0x%llx already in use\n",
+ (unsigned long long)pci_resource_start(dev, 2));
goto out_pci;
}
@@ -663,8 +663,8 @@ static int __devinit wdtpci_init_one(str
}
printk(KERN_INFO
- "PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%04x (Interrupt %d)\n",
- io, irq);
+ "PCI-WDT500/501 (PCI-WDG-CSM) driver 0.10 at 0x%llx (Interrupt %d)\n",
+ (unsigned long long)io, irq);
/* Check that the heartbeat value is within its range;
if not reset to the default */
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* Re: [PATCH -next] block: blk-iopoll sysctl iff CONFIG_BLOCK
From: Jens Axboe @ 2009-08-07 19:21 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, akpm, linux-next, LKML
In-Reply-To: <20090807111659.3d8da27f.randy.dunlap@oracle.com>
On Fri, Aug 07 2009, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> New block-iopoll sysctl should be surrounded by CONFIG_BLOCK to
> prevent build error:
>
> kernel/built-in.o:(.data+0x2990): undefined reference to `blk_iopoll_enabled'
Thanks, I'll just kill off this sysctl, it should be driver controller
anyway. Was just easier for testing :-)
--
Jens Axboe
^ permalink raw reply
* [PATCH -next] staging/hv: blk dev depends on SCSI
From: Randy Dunlap @ 2009-08-07 18:17 UTC (permalink / raw)
To: Stephen Rothwell, gregkh, akpm; +Cc: linux-next, LKML
In-Reply-To: <20090807183118.e71b4db2.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
hv block driver uses scsi_*() interfaces so it should depend on SCSI.
ERROR: "scsi_normalize_sense" [drivers/staging/hv/hv_blkvsc.ko] undefined!
ERROR: "scsi_print_sense_hdr" [drivers/staging/hv/hv_blkvsc.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/staging/hv/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20090807.orig/drivers/staging/hv/Kconfig
+++ linux-next-20090807/drivers/staging/hv/Kconfig
@@ -15,7 +15,7 @@ config HYPERV_STORAGE
config HYPERV_BLOCK
tristate "Microsoft Hyper-V virtual block driver"
- depends on BLOCK && m
+ depends on BLOCK && SCSI && m
default n
help
Select this option to enable the Hyper-V virtual block driver.
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* [PATCH -next] block: blk-iopoll sysctl iff CONFIG_BLOCK
From: Randy Dunlap @ 2009-08-07 18:16 UTC (permalink / raw)
To: Stephen Rothwell, akpm, jens.axboe; +Cc: linux-next, LKML
In-Reply-To: <20090807183118.e71b4db2.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
New block-iopoll sysctl should be surrounded by CONFIG_BLOCK to
prevent build error:
kernel/built-in.o:(.data+0x2990): undefined reference to `blk_iopoll_enabled'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
kernel/sysctl.c | 2 ++
1 file changed, 2 insertions(+)
--- linux-next-20090807.orig/kernel/sysctl.c
+++ linux-next-20090807/kernel/sysctl.c
@@ -990,6 +990,7 @@ static struct ctl_table kern_table[] = {
.proc_handler = &proc_dointvec,
},
#endif
+#ifdef CONFIG_BLOCK
{
.ctl_name = CTL_UNNUMBERED,
.procname = "blk_iopoll",
@@ -998,6 +999,7 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = &proc_dointvec,
},
+#endif
/*
* NOTE: do not add new entries to this table unless you have read
* Documentation/sysctl/ctl_unnumbered.txt
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* Re: linux-next: Tree for August 6
From: Bartlomiej Zolnierkiewicz @ 2009-08-07 13:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <200908062250.51498.bzolnier@gmail.com>
On Thursday 06 August 2009 22:50:50 Bartlomiej Zolnierkiewicz wrote:
> On Thursday 06 August 2009 11:22:09 Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20090805:
>
> At the moment -next is completely unusable for anything other than
> detecting merge conflicts.. Running -next was never a completely
> smooth experience but for a past year it was more-or-less doable.
> However the last two months have been an absolute horror and I've
> been hitting issues way faster than I was able to trace/report
> them properly..
>
> Right now I still have following *outstanding* issues (on just *one*
> machine/distribution):
>
> - Random (after some long hours) order:6 mode:0x8020 page allocation
> failure (when ipw2200 driver reloads firmware on firmware error).
>
> [ I had first thought that it was caused by SLQB (which got enabled
> as default somewhere along the way) but it also happens with SLUB
> and I have good reasons to believe that is caused by heavy mm
> changes first seen in next-20090618 (I've been testing next-20090617
> for many days and it never happened there), the last confirmed
> release with the problem is next-20090728. ]
If anyone is interested in the full log of the problem:
ipw2200: Firmware error detected. Restarting.
ipw2200/0: page allocation failure. order:6, mode:0x8020
Pid: 1004, comm: ipw2200/0 Not tainted 2.6.31-rc4-next-20090728-04869-gdae50fe-dirty #51
Call Trace:
[<c0396a2c>] ? printk+0xf/0x13
[<c0169ec1>] __alloc_pages_nodemask+0x3dd/0x41f
[<c0106907>] dma_generic_alloc_coherent+0x53/0xb8
[<c01068b4>] ? dma_generic_alloc_coherent+0x0/0xb8
[<e159d12f>] ipw_load_firmware+0x8c/0x4f8 [ipw2200]
[<c01029fc>] ? restore_all_notrace+0x0/0x18
[<e1599e4d>] ? ipw_stop_nic+0x2b/0x5d [ipw2200]
[<e15a194e>] ipw_load+0x8b2/0xf94 [ipw2200]
[<c0399680>] ? _spin_unlock_irqrestore+0x36/0x51
[<e15a57be>] ipw_up+0xe1/0x5c6 [ipw2200]
[<e15a3834>] ? ipw_down+0x1f7/0x1ff [ipw2200]
[<e15a5cd5>] ipw_adapter_restart+0x32/0x46 [ipw2200]
[<e15a5d0a>] ipw_bg_adapter_restart+0x21/0x2c [ipw2200]
[<c0139aac>] worker_thread+0x15e/0x240
[<c0139a6a>] ? worker_thread+0x11c/0x240
[<e15a5ce9>] ? ipw_bg_adapter_restart+0x0/0x2c [ipw2200]
[<c013ce99>] ? autoremove_wake_function+0x0/0x2f
[<c013994e>] ? worker_thread+0x0/0x240
[<c013cc5f>] kthread+0x66/0x6b
[<c013cbf9>] ? kthread+0x0/0x6b
[<c01034eb>] kernel_thread_helper+0x7/0x10
Mem-Info:
DMA per-cpu:
CPU 0: hi: 0, btch: 1 usd: 0
Normal per-cpu:
CPU 0: hi: 186, btch: 31 usd: 178
Active_anon:22467 active_file:10815 inactive_anon:22483
inactive_file:28605 unevictable:2 dirty:626 writeback:190 unstable:0
free:28497 slab:4190 mapped:5638 pagetables:895 bounce:0
DMA free:2084kB min:84kB low:104kB high:124kB active_anon:732kB inactive_anon:996kB active_file:652kB inactive_file:1980kB unevictable:0kB present:15868kB pages_scanned:0 all_unreclaimable? no
lowmem_reserve[]: 0 492 492
Normal free:111904kB min:2792kB low:3488kB high:4188kB active_anon:89136kB inactive_anon:88936kB active_file:42608kB inactive_file:112440kB unevictable:8kB present:503872kB pages_scanned:53 all_unreclaimable? no
lowmem_reserve[]: 0 0 0
DMA: 9*4kB 4*8kB 6*16kB 2*32kB 1*64kB 0*128kB 1*256kB 1*512kB 1*1024kB 0*2048kB 0*4096kB = 2084kB
Normal: 12926*4kB 2437*8kB 1294*16kB 479*32kB 63*64kB 5*128kB 0*256kB 0*512kB 0*1024kB 0*2048kB 0*4096kB = 111904kB
40160 total pagecache pages
0 pages in swap cache
Swap cache stats: add 0, delete 0, find 0/0
Free swap = 0kB
Total swap = 0kB
131056 pages RAM
3587 pages reserved
50606 pages shared
66006 pages non-shared
ipw2200: Unable to load firmware: -12
ipw2200: Unable to load firmware: -12
ipw2200: Failed to up device
^ permalink raw reply
* [PATCH] kallsyms: Fix segfault in prefix_underscores_count().
From: Paul Mundt @ 2009-08-07 9:22 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: Lai Jiangshan, linux-next
As a good indicator that Impact lines are completely useless, commit
b478b782e110fdb4135caa3062b6d687e989d994 "kallsyms, tracing: output more
proper symbol name" introduces a "bugfix" that introduced segfaults on
several of my defconfigs:
http://kisskb.ellerman.id.au/kisskb/buildresult/1017849/
http://kisskb.ellerman.id.au/kisskb/buildresult/1017351/
http://kisskb.ellerman.id.au/kisskb/buildresult/1017354/
The cause is the introduction of prefix_underscores_count() which
attempts to count underscores.. even in symbols that do not have them.
As a result, it just uselessly runs past the end of the buffer until it
crashes.
This adds a strlen iterator that bails out if nothing is found in the
string, which fixes up the observed segfaults.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
---
I've uploaded the symbol list to:
http://userweb.kernel.org/~lethal/symbol-list.gz
that one can pipe in to scripts/kallsyms to reproduce the fault in -next,
incase someone wants to come up with a better fix :-)
scripts/kallsyms.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 64343cc..f1d44b2 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -584,9 +538,14 @@ static int may_be_linker_script_provide_symbol(const struct sym_entry *se)
static int prefix_underscores_count(const char *str)
{
const char *tail = str;
+ size_t len = strlen(str);
+
+ while (*tail != '_') {
+ if (!len--)
+ return 0;
- while (*tail != '_')
tail++;
+ }
return tail - str;
}
^ permalink raw reply related
* linux-next: Tree for August 7
From: Stephen Rothwell @ 2009-08-07 8:31 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8427 bytes --]
Hi all,
Changes since 20090806:
This tree fails to build for powerpc allyesconfig (final link problem).
The net tree gained a conflict against Linus' tree.
The rr tree lost its conflicts.
The security-testing tree gained a build failure so I used the version
from next-20090806.
The agp tree lost its build failure.
The tip tree gained a conflict against the net tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 138 trees (counting Linus' and 20 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/socket.h
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
[master 806a9f6] Revert "cpumask:remove-set_cpus_allowed"
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
Merging voltage/for-next
Merging security-testing/next
$ git reset --hard HEAD^
Merging refs/next/20090806/security-testing
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Applying: drbd: fix for removal of blk_queue_stack_limits
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/include/asm/socket.h
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging oprofile/for-next
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
CONFLICT (content): Merge conflict in include/linux/topology.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c
CONFLICT (content): Merge conflict in drivers/usb/host/r8a66597-hcd.c
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tip tree with the net tree
From: Stephen Rothwell @ 2009-08-07 6:47 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Arnd Bergmann, Jan Engelhardt,
David S. Miller
[-- Attachment #1: Type: text/plain, Size: 615 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/x86/include/asm/socket.h between commits
49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL
getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net:
implement a SO_DOMAIN getsockoption") from the net tree and commit
73a2d096fdf23aa841f7595d114a11ec85a85e4d ("x86: remove all now-duplicate
header files") from the tip tree.
The latter change supercedes the former ones, so I used the latter.
--
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: security-testing tree build failure
From: Stephen Rothwell @ 2009-08-07 4:59 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, linux-kernel, Eric Paris
[-- Attachment #1: Type: text/plain, Size: 651 bytes --]
Hi James,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
kernel/sysctl.c:1321: error: 'mmap_min_addr_handler' undeclared here (not in a function)
mm/mmap.c: In function 'do_mmap_pgoff':
mm/mmap.c:935: error: implicit declaration of function 'round_hint_to_min'
Caused by commit a2551df7ec568d87793d2eea4ca744e86318f205
("Security/SELinux: seperate lsm specific mmap_min_addr") -
CONFIG_SECURITY is not set in this build.
I have used the version of the security-testing tree from next-20090806
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 net tree with Linus' tree
From: Stephen Rothwell @ 2009-08-07 1:58 UTC (permalink / raw)
To: David Miller
Cc: linux-next, linux-kernel, Arnd Bergmann, Jan Engelhardt,
Michal Simek
[-- Attachment #1: Type: text/plain, Size: 639 bytes --]
Hi Dave,
Today's linux-next merge of the net tree got a conflict in
arch/microblaze/include/asm/socket.h between commit
81d8279ea31a3fc6d4ffacd87119a04c561ca62e ("microblaze: fall back on
generic header files for the ABI") from Linus' tree and commits
49c794e94649020248e37b78db16cd25bad38b4f ("net: implement a SO_PROTOCOL
getsockoption") and 0d6038ee76f2e06b79d0465807f67e86bf4025de ("net:
implement a SO_DOMAIN getsockoption") from the net tree.
The former commit supercedes the latter ones, so I used that version.
--
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: Tree for August 6
From: Bartlomiej Zolnierkiewicz @ 2009-08-06 20:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20090806192209.513abec7.sfr@canb.auug.org.au>
On Thursday 06 August 2009 11:22:09 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090805:
At the moment -next is completely unusable for anything other than
detecting merge conflicts.. Running -next was never a completely
smooth experience but for a past year it was more-or-less doable.
However the last two months have been an absolute horror and I've
been hitting issues way faster than I was able to trace/report
them properly..
Right now I still have following *outstanding* issues (on just *one*
machine/distribution):
- Random (after some long hours) order:6 mode:0x8020 page allocation
failure (when ipw2200 driver reloads firmware on firmware error).
[ I had first thought that it was caused by SLQB (which got enabled
as default somewhere along the way) but it also happens with SLUB
and I have good reasons to believe that is caused by heavy mm
changes first seen in next-20090618 (I've been testing next-20090617
for many days and it never happened there), the last confirmed
release with the problem is next-20090728. ]
- bdi warning, http://lkml.org/lkml/2009/7/15/262, (this one goes back
to at least next-20090708, reconfirmed with next-20090806).
- Random OOPSes on shutdown (since the last week or so, didn't have time
to investigate them).
- Lockup on stopping iptables (I've just noticed it in next-20090806,
seems to also happen with next-20090731).
I give up and I'm back to using Linus' tree.. :(
^ permalink raw reply
* Re: [PATCH -next] isdn: fix netjet build errors
From: David Miller @ 2009-08-06 20:10 UTC (permalink / raw)
To: isdn; +Cc: randy.dunlap, sfr, linux-next, linux-kernel, akpm
In-Reply-To: <200908060705.33130.isdn@linux-pingi.de>
From: Karsten Keil <isdn@linux-pingi.de>
Date: Thu, 6 Aug 2009 07:05:32 +0200
> My original approach was to change the Makefile to enter this directory
> unconditional, but it seems that this part of the patch was lost during
> development. I will send a new patch after testing with different configs.
Ok, thanks!
^ permalink raw reply
* Re: linux-next: agp tree build failure
From: David Woodhouse @ 2009-08-06 9:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20090806191054.74c475e5.sfr@canb.auug.org.au>
On Thu, 2009-08-06 at 02:10 -0700, Stephen Rothwell wrote:
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> drivers/char/agp/uninorth-agp.c: In function 'uninorth_configure':
> drivers/char/agp/uninorth-agp.c:138: error: 'struct agp_bridge_data' has no member named 'scratch_page_real'
>
> Caused by commit c2980d8c2961113f24863f70d8ad016f55224c81 ("agp: Switch
> agp_{un,}map_page() to take struct page * argument").
>
> I have reverted that commit for today (and
> 6a12235c7d2d75c7d94b9afcaaecd422ff845ce0 ("agp: kill phys_to_gart() and
> gart_to_phys()") which depends on it).
Oops, sorry -- I thought I'd dealt with that.
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 2e99311..4317a55 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -135,7 +135,7 @@ static int uninorth_configure(void)
if (is_u3) {
pci_write_config_dword(agp_bridge->dev,
UNI_N_CFG_GART_DUMMY_PAGE,
- agp_bridge->scratch_page_real >> 12);
+ page_to_phys(agp_bridge->scratch_page_page) >> 12);
}
return 0;
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply related
* linux-next: Tree for August 6
From: Stephen Rothwell @ 2009-08-06 9:22 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8479 bytes --]
Hi all,
Changes since 20090805:
The next-yyyymmdd tags will now be signed tags by request.
This tree fails to build for powerpc allyesconfig (final link problem).
The agp tree gained a build failure for which I reverted a commit.
The edac-amd tree lost its conflicts but gained another conflict against
the rr tree.
The tty tree lost a conflict.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 138 trees (counting Linus' and 20 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/lguest/boot.c
CONFLICT (content): Merge conflict in drivers/lguest/page_tables.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci.c
[master c69a397] Revert "cpumask:remove-set_cpus_allowed"
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Applying: drbd: fix for removal of blk_queue_stack_limits
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging oprofile/for-next
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c
CONFLICT (content): Merge conflict in drivers/usb/host/r8a66597-hcd.c
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master
[master 0e15677] Revert "agp: kill phys_to_gart() and gart_to_phys()"
[master c95724f] Revert "agp: Switch agp_{un,}map_page() to take struct page * argument"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: agp tree build failure
From: Stephen Rothwell @ 2009-08-06 9:10 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, David Woodhouse
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
Hi Dave,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/char/agp/uninorth-agp.c: In function 'uninorth_configure':
drivers/char/agp/uninorth-agp.c:138: error: 'struct agp_bridge_data' has no member named 'scratch_page_real'
Caused by commit c2980d8c2961113f24863f70d8ad016f55224c81 ("agp: Switch
agp_{un,}map_page() to take struct page * argument").
I have reverted that commit for today (and
6a12235c7d2d75c7d94b9afcaaecd422ff845ce0 ("agp: kill phys_to_gart() and
gart_to_phys()") which depends on it).
--
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 edac-amd tree with the rr tree
From: Borislav Petkov @ 2009-08-06 8:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Borislav Petkov, linux-next, linux-kernel, Li Zefan,
Rusty Russell, Andreas Herrmann
In-Reply-To: <20090806175152.1e0b96cf.sfr@canb.auug.org.au>
Hi,
On Thu, Aug 06, 2009 at 05:51:52PM +1000, Stephen Rothwell wrote:
> Hi Borislav,
>
> Today's linux-next merge of the edac-amd tree got a conflict in
> arch/x86/kernel/smpboot.c between commit
> d39044d21e1a2d3713f1329ad22d23df5d20140b ("cpumask: use zalloc_cpumask_var
> () where possible") from the rr tree and commit
> a763af6587fbead6cee75ad3ae14709fa67e7dbb ("x86: provide CPU topology
> information for multi-node processors") from the edac-amd tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
I guess this is the best solution for now. Andreas' latest patches went
out yesterday and they too contain the
alloc_cpumask_var
cpumask_clear
order. Which means, this fix will have to be applied then between the
tip and the rr trees after Ingo merges Andreas' stuff, so please hold on
to it until after the merge window.
Thanks.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/x86/kernel/smpboot.c
> index 70bd79b,5428337..0000000
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@@ -1057,9 -1068,14 +1068,10 @@@ void __init native_smp_prepare_cpus(uns
> #endif
> current_thread_info()->cpu = 0; /* needed? */
> for_each_possible_cpu(i) {
> - alloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
> - alloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
> - alloc_cpumask_var(&per_cpu(cpu_node_map, i), GFP_KERNEL);
> - alloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
> - cpumask_clear(per_cpu(cpu_core_map, i));
> - cpumask_clear(per_cpu(cpu_node_map, i));
> - cpumask_clear(per_cpu(cpu_sibling_map, i));
> - cpumask_clear(cpu_data(i).llc_shared_map);
> + zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
> + zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
> ++ zalloc_cpumask_var(&per_cpu(cpu_node_map, i), GFP_KERNEL);
> + zalloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
> }
> set_cpu_sibling_map(0);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Regards/Gruss,
Boris.
^ permalink raw reply
* linux-next: manual merge of the edac-amd tree with the rr tree
From: Stephen Rothwell @ 2009-08-06 7:51 UTC (permalink / raw)
To: Borislav Petkov
Cc: linux-next, linux-kernel, Li Zefan, Rusty Russell,
Andreas Herrmann
Hi Borislav,
Today's linux-next merge of the edac-amd tree got a conflict in
arch/x86/kernel/smpboot.c between commit
d39044d21e1a2d3713f1329ad22d23df5d20140b ("cpumask: use zalloc_cpumask_var
() where possible") from the rr tree and commit
a763af6587fbead6cee75ad3ae14709fa67e7dbb ("x86: provide CPU topology
information for multi-node processors") from the edac-amd tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kernel/smpboot.c
index 70bd79b,5428337..0000000
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -1057,9 -1068,14 +1068,10 @@@ void __init native_smp_prepare_cpus(uns
#endif
current_thread_info()->cpu = 0; /* needed? */
for_each_possible_cpu(i) {
- alloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
- alloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
- alloc_cpumask_var(&per_cpu(cpu_node_map, i), GFP_KERNEL);
- alloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
- cpumask_clear(per_cpu(cpu_core_map, i));
- cpumask_clear(per_cpu(cpu_node_map, i));
- cpumask_clear(per_cpu(cpu_sibling_map, i));
- cpumask_clear(cpu_data(i).llc_shared_map);
+ zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
+ zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
++ zalloc_cpumask_var(&per_cpu(cpu_node_map, i), GFP_KERNEL);
+ zalloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
}
set_cpu_sibling_map(0);
^ permalink raw reply
* Re: [PATCH -next] isdn: fix netjet build errors
From: Karsten Keil @ 2009-08-06 5:05 UTC (permalink / raw)
To: David Miller; +Cc: randy.dunlap, sfr, linux-next, linux-kernel, akpm
In-Reply-To: <20090805.120302.204538944.davem@davemloft.net>
On Mittwoch, 5. August 2009 21:03:02 David Miller wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> Date: Wed, 5 Aug 2009 09:26:35 -0700
>
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > Fix netjet driver link errors when ISDN_I4L is not enabled:
> >
> > drivers/built-in.o: In function `mode_tiger':
> > netjet.c:(.text+0x325dc8): undefined reference to `isdnhdlc_rcv_init'
> > netjet.c:(.text+0x325dd5): undefined reference to `isdnhdlc_out_init'
> > drivers/built-in.o: In function `fill_dma':
> > netjet.c:(.text+0x325fb6): undefined reference to `isdnhdlc_encode'
> > drivers/built-in.o: In function `read_dma':
> > netjet.c:(.text+0x32631a): undefined reference to `isdnhdlc_decode'
> > drivers/built-in.o: In function `nj_irq':
> > netjet.c:(.text+0x326e01): undefined reference to `isdnhdlc_encode'
> >
> > or move isdnhdlc.c to some other sub-dir..
> >
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
>
> Thanks Randy.
Thanks too.
>
> Karsten, let me know if you want me to apply this directly to
> net-next-2.6 or if you want to fix it differently or send it
> with other changes you have pending.
>
My original approach was to change the Makefile to enter this directory
unconditional, but it seems that this part of the patch was lost during
development. I will send a new patch after testing with different configs.
Karsten
^ permalink raw reply
* Re: Next July 29 : Hugetlb test failure (OOPS free_hugepte_range)
From: Sachin Sant @ 2009-08-06 4:40 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Stephen Rothwell, linux-next, linuxppc-dev
In-Reply-To: <1249530754.18245.71.camel@pasglop>
Benjamin Herrenschmidt wrote:
> Does this patch fixes it ?
>
> [PATCH] powerpc/mm: Fix encoding of page table cache numbers
>
> The mask used to encode the page table cache number in the
> batch when freeing page tables was too small for the new
> possible values of MMU page sizes. This increases it along
> with a comment explaining the constraints.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
>
Yes this patch fixed the issue for me. Thanks Ben.
Tested-by: Sachin Sant <sachinp@in.ibm.com>
Regards
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ 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