* Re: [PATCH 2.6.30] RDMA/cxgb3: remove modulo math from build_rdma_recv().
From: Roland Dreier @ 2009-02-13 5:43 UTC (permalink / raw)
To: Steve Wise; +Cc: general, randy.dunlap, linux-next, linux-kernel
In-Reply-To: <20090211222915.19520.22647.stgit@dell3.ogc.int>
thanks, applied
^ permalink raw reply
* Re: [PATCH] ext4: Initialize list properly
From: Theodore Tso @ 2009-02-12 22:00 UTC (permalink / raw)
To: Aneesh Kumar K.V; +Cc: linux-kernel, linux-ext4, linux-next
In-Reply-To: <1234422331-32766-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
On Thu, Feb 12, 2009 at 12:35:31PM +0530, Aneesh Kumar K.V wrote:
> We need to initialize the list_head properly before we add
> them to the any list. Otherwise with list debug on we get
> list corruption warnings.
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Added to the ext4 patch queue with a slight adjustment in the patch
commit for readability issues:
When creating a new ext4_prealloc_space structure, we have to
initialize its list_head pointers before we add them to any prealloc
lists. Otherwise, with list debug enabled, we will get list
corruption warnings.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
- Ted
^ permalink raw reply
* Re: [PATCH -next] security/audit/ima: fix build error
From: James Morris @ 2009-02-12 22:31 UTC (permalink / raw)
To: Randy Dunlap
Cc: Mimi Zohar, akpm, Stephen Rothwell, LKML, linux-next, Al Viro,
Mimi Zohar
In-Reply-To: <20090212095414.733dd248.randy.dunlap@oracle.com>
On Thu, 12 Feb 2009, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> IMA_LSM_RULES requires AUDIT. This is automatic if SECURITY_SELINUX=y
> but not when SECURITY_SMACK=y (and SECURITY_SELINUX=n), so make the
> dependency explicit. This fixes the following build error:
>
> security/integrity/ima/ima_policy.c:111:error: implicit declaration of function 'security_audit_rule_match'
> security/integrity/ima/ima_policy.c:230:error: implicit declaration of function 'security_audit_rule_init'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next
> ---
> security/integrity/ima/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-next-20090212.orig/security/integrity/ima/Kconfig
> +++ linux-next-20090212/security/integrity/ima/Kconfig
> @@ -49,7 +49,7 @@ config IMA_AUDIT
>
> config IMA_LSM_RULES
> bool
> - depends on IMA && (SECURITY_SELINUX || SECURITY_SMACK)
> + depends on IMA && AUDIT && (SECURITY_SELINUX || SECURITY_SMACK)
> default y
> help
> - Disabling this option will disregard LSM based policy rules
> + Disabling this option will disregard LSM based policy rules.
>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* Re: linux-next: wireless tree build failure
From: Stephen Rothwell @ 2009-02-12 22:07 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, David Kilroy
In-Reply-To: <20090212161639.GA4091@tuxdriver.com>
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
Hi John,
On Thu, 12 Feb 2009 11:16:40 -0500 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> I'll fix this up with a patch like below...
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 test scripts
From: Uwe Kleine-König @ 2009-02-12 20:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20090206142022.GA5430@pengutronix.de>
Hello,
On Fri, Feb 06, 2009 at 03:20:22PM +0100, Uwe Kleine-König wrote:
> I plan to setup something similar to linux-next for the Pengutronix test
> lab to build a tree that contains the work of all our developers for
> daily testing.
>
> It would be really great if I could take a look into your scripts to
> manage linux-next. I tried searching the web for them, but without
> success.
>
> Are the scripts somewhere available without being found by me? If yes,
> where are they, if not, do you can publish them somewhere?
After some more search I found the script by James Bottomley[1].
Still I'd like to know if you put some work in that script or even
created your own to prevent duplication of work.
If you care that I don't just use your script without contributing back,
I intend to use it among others for our (public) mxc tree at
git://git.pengutronix.de/git/imx/linux-2.6.git which gets much interest
in the arm-linux community and you can be sure that you will benefit
from our changes to your script.
Best regards
Uwe
[1] http://article.gmane.org/gmane.linux.kernel/626055/
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* Re: [ipw3945-devel] X200: Resume and iwlwifi on 2.6.29-rc4-ikn-00001-gd5b5623
From: reinette chatre @ 2009-02-12 19:48 UTC (permalink / raw)
To: Nico Schottelius
Cc: Linux Next Mailing List, LKML,
ipw3945-devel@lists.sourceforge.net
In-Reply-To: <20090210070147.GA4684@denkbrett.schottelius.org>
On Mon, 2009-02-09 at 23:01 -0800, Nico Schottelius wrote:
> Good morning!
>
> Summary on the X200:
> - First resume after suspend takes 20 seconds
> - Further resumes work fine
> - wlan works *before* first suspend and wakeup
> - after that the same happens as on 2.6.29-rc3-ikn-00697-gae1a25d:
> the device refuses to come up with the message
> "iwlagn: Could not load the INST uCode section" and
> "iwlagn: Unable to set up bootstrap uCode: -110"
Sorry that I missed responding to your email in all the messages
regarding this problem. A patch was recently sent to address it - could
you please try with
http://marc.info/?l=linux-wireless&m=123429595818495&w=2 ?
Thanks
Reinette
^ permalink raw reply
* [PATCH -next] x86_32: fix printk formats
From: Randy Dunlap @ 2009-02-12 18:43 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, Andrew Morton, x86
In-Reply-To: <20090212194408.ff7489c1.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix printk format warnings and also change 2 %ld to %lu for unsigned long
variables.
arch/x86/mm/init_32.c:727: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
arch/x86/mm/init_32.c:735: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
arch/x86/mm/init_32.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- linux-next-20090212.orig/arch/x86/mm/init_32.c
+++ linux-next-20090212/arch/x86/mm/init_32.c
@@ -721,7 +721,7 @@ void __init find_low_pfn_range(void)
highmem_pages = 0;
#ifdef CONFIG_HIGHMEM
if (highmem_pages >= max_pfn) {
- printk(KERN_ERR "highmem size specified (%uMB) is "
+ printk(KERN_ERR "highmem size specified (%luMB) is "
"bigger than pages available (%luMB)!.\n",
pages_to_mb(highmem_pages),
pages_to_mb(max_pfn));
@@ -730,7 +730,7 @@ void __init find_low_pfn_range(void)
if (highmem_pages) {
if (max_low_pfn - highmem_pages <
64*1024*1024/PAGE_SIZE){
- printk(KERN_ERR "highmem size %uMB results in "
+ printk(KERN_ERR "highmem size %luMB results in "
"smaller than 64MB lowmem, ignoring it.\n"
, pages_to_mb(highmem_pages));
highmem_pages = 0;
@@ -755,7 +755,7 @@ void __init initmem_init(unsigned long s
highstart_pfn = max_low_pfn;
memory_present(0, 0, highend_pfn);
e820_register_active_regions(0, 0, highend_pfn);
- printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",
+ printk(KERN_NOTICE "%luMB HIGHMEM available.\n",
pages_to_mb(highend_pfn - highstart_pfn));
num_physpages = highend_pfn;
high_memory = (void *) __va(highstart_pfn * PAGE_SIZE - 1) + 1;
@@ -768,7 +768,7 @@ void __init initmem_init(unsigned long s
#ifdef CONFIG_FLATMEM
max_mapnr = num_physpages;
#endif
- printk(KERN_NOTICE "%ldMB LOWMEM available.\n",
+ printk(KERN_NOTICE "%luMB LOWMEM available.\n",
pages_to_mb(max_low_pfn));
setup_bootmem_allocator();
^ permalink raw reply
* Re: [PATCH -next] security/audit/ima: fix build error
From: Randy Dunlap @ 2009-02-12 18:30 UTC (permalink / raw)
To: Mimi Zohar
Cc: Randy Dunlap, Mimi Zohar, akpm, Stephen Rothwell, James Morris,
LKML, linux-next, Al Viro
In-Reply-To: <1234463058.3104.7.camel@localhost.localdomain>
Mimi Zohar wrote:
> On Thu, 2009-02-12 at 09:54 -0800, Randy Dunlap wrote:
>> On Tue, 10 Feb 2009 19:30:24 -0500 Mimi Zohar wrote:
>>
>>> Stephen Rothwell <sfr@canb.auug.org.au> wrote on 02/10/2009 05:40:50 PM:
>>>
>>>> Hi Randy,
>>>>
>>>> On Tue, 10 Feb 2009 11:55:12 -0800 Randy Dunlap
>>> <randy.dunlap@oracle.com> wrote:
>>>>> Stephen Rothwell wrote:
>>>>>> Dropped trees (temporarily):
>>>>>> audit (difficult conflicts)
>>>>> Maybe this is fixed by the dropped audit tree?
>>>> The audit tree is Al Viro's (cc'd). But I *think* everything in it has
>>>> been applied upstream.
>>>>
>>>>> linux-next-20090210/security/integrity/ima/ima_policy.c:111: error:
>>> implicit
>>>> declaration of function 'security_audit_rule_match'
>>>>> linux-next-20090210/security/integrity/ima/ima_policy.c:230: error:
>>> implicit
>>>> declaration of function 'security_audit_rule_init'
>>>>> when
>>>>> CONFIG_SECURITY=y
>>>>> CONFIG_AUDIT=n
>>>>> CONFIG_IMA=y
>>>>> CONFIG_IMA_AUDIT=y
>>>> This looks more like a security subsystem than audit to me?
>>> These are the IMA Kconfig rules:
>>> CONFIG_IMA=y
>>> CONFIG_IMA_MEASURE_PCR_IDX=10
>>> CONFIG_IMA_AUDIT=y
>>> CONFIG_IMA_LSM_RULES=y
>>>
>>> CONFIG_IMA_LSM_RULES requires the audit subsystem. The default
>> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>>> measurement policy is not defined terms of the LSM extended
>>> attributes, and thus is not required.
>>
>> This config still fails to build in linux-next-20090212. And the ^^^
>> statement above may be correct, but it's not enforced in Kconfig, so let's
>> do that, OK?
>
> The patch looks good to me, but looking at the code,
> http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=blob_plain;f=mm/shmem.c;hb=168b70b72a78f289046823d810c29376e211a6de
> it doesn't look like the previous patch was applied.
Which previous patch? The one for ima & SHMEM=n?
Yes, that build combination still fails also.
James...?
>> From: Randy Dunlap <randy.dunlap@oracle.com>
>>
>> IMA_LSM_RULES requires AUDIT. This is automatic if SECURITY_SELINUX=y
>> but not when SECURITY_SMACK=y (and SECURITY_SELINUX=n), so make the
>> dependency explicit. This fixes the following build error:
>>
>> security/integrity/ima/ima_policy.c:111:error: implicit declaration of function 'security_audit_rule_match'
>> security/integrity/ima/ima_policy.c:230:error: implicit declaration of function 'security_audit_rule_init'
>>
>> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Acked-by: Mimi Zohar <zohar@us.ibm.com>
>
>> ---
>> security/integrity/ima/Kconfig | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> --- linux-next-20090212.orig/security/integrity/ima/Kconfig
>> +++ linux-next-20090212/security/integrity/ima/Kconfig
>> @@ -49,7 +49,7 @@ config IMA_AUDIT
>>
>> config IMA_LSM_RULES
>> bool
>> - depends on IMA && (SECURITY_SELINUX || SECURITY_SMACK)
>> + depends on IMA && AUDIT && (SECURITY_SELINUX || SECURITY_SMACK)
>> default y
>> help
>> - Disabling this option will disregard LSM based policy rules
>> + Disabling this option will disregard LSM based policy rules.
--
~Randy
^ permalink raw reply
* Re: [PATCH -next] security/audit/ima: fix build error
From: Mimi Zohar @ 2009-02-12 18:24 UTC (permalink / raw)
To: Randy Dunlap
Cc: Mimi Zohar, akpm, Stephen Rothwell, James Morris, LKML,
linux-next, Al Viro
In-Reply-To: <20090212095414.733dd248.randy.dunlap@oracle.com>
On Thu, 2009-02-12 at 09:54 -0800, Randy Dunlap wrote:
> On Tue, 10 Feb 2009 19:30:24 -0500 Mimi Zohar wrote:
>
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote on 02/10/2009 05:40:50 PM:
> >
> > > Hi Randy,
> > >
> > > On Tue, 10 Feb 2009 11:55:12 -0800 Randy Dunlap
> > <randy.dunlap@oracle.com> wrote:
> > > >
> > > > Stephen Rothwell wrote:
> > > > >
> > > > > Dropped trees (temporarily):
> > > > > audit (difficult conflicts)
> > > >
> > > > Maybe this is fixed by the dropped audit tree?
> > >
> > > The audit tree is Al Viro's (cc'd). But I *think* everything in it has
> > > been applied upstream.
> > >
> > > > linux-next-20090210/security/integrity/ima/ima_policy.c:111: error:
> > implicit
> > > declaration of function 'security_audit_rule_match'
> > > > linux-next-20090210/security/integrity/ima/ima_policy.c:230: error:
> > implicit
> > > declaration of function 'security_audit_rule_init'
> > > >
> > > > when
> > > > CONFIG_SECURITY=y
> > > > CONFIG_AUDIT=n
> > > > CONFIG_IMA=y
> > > > CONFIG_IMA_AUDIT=y
> > >
> > > This looks more like a security subsystem than audit to me?
> >
> > These are the IMA Kconfig rules:
> > CONFIG_IMA=y
> > CONFIG_IMA_MEASURE_PCR_IDX=10
> > CONFIG_IMA_AUDIT=y
> > CONFIG_IMA_LSM_RULES=y
> >
> > CONFIG_IMA_LSM_RULES requires the audit subsystem. The default
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> > measurement policy is not defined terms of the LSM extended
> > attributes, and thus is not required.
>
>
> This config still fails to build in linux-next-20090212. And the ^^^
> statement above may be correct, but it's not enforced in Kconfig, so let's
> do that, OK?
The patch looks good to me, but looking at the code,
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=blob_plain;f=mm/shmem.c;hb=168b70b72a78f289046823d810c29376e211a6de
it doesn't look like the previous patch was applied.
>
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> IMA_LSM_RULES requires AUDIT. This is automatic if SECURITY_SELINUX=y
> but not when SECURITY_SMACK=y (and SECURITY_SELINUX=n), so make the
> dependency explicit. This fixes the following build error:
>
> security/integrity/ima/ima_policy.c:111:error: implicit declaration of function 'security_audit_rule_match'
> security/integrity/ima/ima_policy.c:230:error: implicit declaration of function 'security_audit_rule_init'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Mimi Zohar <zohar@us.ibm.com>
> ---
> security/integrity/ima/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-next-20090212.orig/security/integrity/ima/Kconfig
> +++ linux-next-20090212/security/integrity/ima/Kconfig
> @@ -49,7 +49,7 @@ config IMA_AUDIT
>
> config IMA_LSM_RULES
> bool
> - depends on IMA && (SECURITY_SELINUX || SECURITY_SMACK)
> + depends on IMA && AUDIT && (SECURITY_SELINUX || SECURITY_SMACK)
> default y
> help
> - Disabling this option will disregard LSM based policy rules
> + Disabling this option will disregard LSM based policy rules.
^ permalink raw reply
* [PATCH -next] media/zoran: fix printk format
From: Randy Dunlap @ 2009-02-12 18:19 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, linux-media, Mauro Carvalho Chehab
In-Reply-To: <20090212194408.ff7489c1.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix printk format warning:
drivers/media/video/zoran/zoran_driver.c:345: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'phys_addr_t'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/media/video/zoran/zoran_driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20090212.orig/drivers/media/video/zoran/zoran_driver.c
+++ linux-next-20090212/drivers/media/video/zoran/zoran_driver.c
@@ -344,9 +344,9 @@ v4l_fbuffer_alloc (struct file *file)
SetPageReserved(MAP_NR(mem + off));
dprintk(4,
KERN_INFO
- "%s: v4l_fbuffer_alloc() - V4L frame %d mem 0x%lx (bus: 0x%lx)\n",
+ "%s: v4l_fbuffer_alloc() - V4L frame %d mem 0x%lx (bus: 0x%llx)\n",
ZR_DEVNAME(zr), i, (unsigned long) mem,
- virt_to_bus(mem));
+ (unsigned long long)virt_to_bus(mem));
} else {
/* Use high memory which has been left at boot time */
^ permalink raw reply
* [PATCH -next] security/audit/ima: fix build error
From: Randy Dunlap @ 2009-02-12 17:54 UTC (permalink / raw)
To: Mimi Zohar, akpm
Cc: Stephen Rothwell, James Morris, LKML, linux-next, Al Viro,
Mimi Zohar
In-Reply-To: <OFF3345B15.9471295A-ON8525755A.00024CFE-8525755A.0002C8E8@us.ibm.com>
On Tue, 10 Feb 2009 19:30:24 -0500 Mimi Zohar wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> wrote on 02/10/2009 05:40:50 PM:
>
> > Hi Randy,
> >
> > On Tue, 10 Feb 2009 11:55:12 -0800 Randy Dunlap
> <randy.dunlap@oracle.com> wrote:
> > >
> > > Stephen Rothwell wrote:
> > > >
> > > > Dropped trees (temporarily):
> > > > audit (difficult conflicts)
> > >
> > > Maybe this is fixed by the dropped audit tree?
> >
> > The audit tree is Al Viro's (cc'd). But I *think* everything in it has
> > been applied upstream.
> >
> > > linux-next-20090210/security/integrity/ima/ima_policy.c:111: error:
> implicit
> > declaration of function 'security_audit_rule_match'
> > > linux-next-20090210/security/integrity/ima/ima_policy.c:230: error:
> implicit
> > declaration of function 'security_audit_rule_init'
> > >
> > > when
> > > CONFIG_SECURITY=y
> > > CONFIG_AUDIT=n
> > > CONFIG_IMA=y
> > > CONFIG_IMA_AUDIT=y
> >
> > This looks more like a security subsystem than audit to me?
>
> These are the IMA Kconfig rules:
> CONFIG_IMA=y
> CONFIG_IMA_MEASURE_PCR_IDX=10
> CONFIG_IMA_AUDIT=y
> CONFIG_IMA_LSM_RULES=y
>
> CONFIG_IMA_LSM_RULES requires the audit subsystem. The default
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> measurement policy is not defined terms of the LSM extended
> attributes, and thus is not required.
This config still fails to build in linux-next-20090212. And the ^^^
statement above may be correct, but it's not enforced in Kconfig, so let's
do that, OK?
From: Randy Dunlap <randy.dunlap@oracle.com>
IMA_LSM_RULES requires AUDIT. This is automatic if SECURITY_SELINUX=y
but not when SECURITY_SMACK=y (and SECURITY_SELINUX=n), so make the
dependency explicit. This fixes the following build error:
security/integrity/ima/ima_policy.c:111:error: implicit declaration of function 'security_audit_rule_match'
security/integrity/ima/ima_policy.c:230:error: implicit declaration of function 'security_audit_rule_init'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
security/integrity/ima/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20090212.orig/security/integrity/ima/Kconfig
+++ linux-next-20090212/security/integrity/ima/Kconfig
@@ -49,7 +49,7 @@ config IMA_AUDIT
config IMA_LSM_RULES
bool
- depends on IMA && (SECURITY_SELINUX || SECURITY_SMACK)
+ depends on IMA && AUDIT && (SECURITY_SELINUX || SECURITY_SMACK)
default y
help
- Disabling this option will disregard LSM based policy rules
+ Disabling this option will disregard LSM based policy rules.
^ permalink raw reply
* [PATCH] wireless: fix for CONFIG_NL80211=n
From: Randy Dunlap @ 2009-02-12 17:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, linux-wireless@vger.kernel.org,
linville@tuxdriver.com
In-Reply-To: <20090212194408.ff7489c1.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Add empty function for case of CONFIG_NL80211=n:
net/wireless/scan.c:35: error: implicit declaration of function 'nl80211_send_scan_aborted'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
net/wireless/nl80211.h | 4 ++++
1 file changed, 4 insertions(+)
--- linux-next-20090212.orig/net/wireless/nl80211.h
+++ linux-next-20090212/net/wireless/nl80211.h
@@ -27,6 +27,10 @@ static inline void
nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
struct net_device *netdev)
{}
+static inline void nl80211_send_scan_aborted(
+ struct cfg80211_registered_device *rdev,
+ struct net_device *netdev)
+{}
#endif /* CONFIG_NL80211 */
#endif /* __NET_WIRELESS_NL80211_H */
^ permalink raw reply
* Re: linux-next: Tree for February 12 (ide)
From: Randy Dunlap @ 2009-02-12 16:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML, linux-ide, Bartlomiej Zolnierkiewicz
In-Reply-To: <20090212194408.ff7489c1.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090211:
When
# CONFIG_BLK_DEV_IDEDMA is not set
linux-next-20090212/drivers/ide/ide-taskfile.c:108: error: 'ide_dma_intr' undeclared (first use in this function)
--
~Randy
^ permalink raw reply
* Re: linux-next: wireless tree build failure
From: John W. Linville @ 2009-02-12 16:16 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, David Kilroy
In-Reply-To: <20090212193517.3f393726.sfr@canb.auug.org.au>
On Thu, Feb 12, 2009 at 07:35:17PM +1100, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> net/built-in.o: In function `michael_mic':
> (.opd+0x3ba78): multiple definition of `michael_mic'
> drivers/built-in.o:(.opd+0x552a8): first defined here
> net/built-in.o: In function `michael_mic':
> net/mac80211/michael.c:58: multiple definition of `.michael_mic'
> drivers/built-in.o:drivers/net/wireless/orinoco/mic.c:49: first defined here
>
> Immediate cause is commit 84875201dd1150dc2c16780b944fe501d588ffba
> ("orinoco: Move MIC helpers into new file").
>
> I have reverted that commit (and several following ones that conflicted
> with the revert - see below) for today.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> Created commit b6349c2: Revert "orinoco: Storage class should be before const qualifier"
> Created commit ed58c78: Revert "orinoco: hermes doesn't need to be a separate module"
> Created commit c52856e: Revert "orinoco: hermes_dld does not need to be a module"
> Created commit ee9a469: Revert "orinoco: Move WEXT handlers into a separate file"
> Created commit e668502: Revert "orinoco: Move hardware functions into separate file"
> Created commit d8d7390: Revert "orinoco: Add hardware function to set multicast mode"
> Created commit 6a4d487: Revert "orinoco: Use accessor functions for bitrate tables"
> Created commit ecac0c1: Revert "orinoco: Move firmware handling into a separate file"
> Created commit d2cf8c5: Revert "orinoco: Move MIC helpers into new file"
I'll fix this up with a patch like below...
John
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 0cc1f05..f045444 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -931,7 +931,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev)
len = MICHAEL_MIC_LEN;
}
- michael_mic(priv->tx_tfm_mic,
+ orinoco_mic(priv->tx_tfm_mic,
priv->tkip_key[priv->tx_key].tx_mic,
eh->h_dest, eh->h_source, 0 /* priority */,
skb->data + ETH_HLEN, skb->len - ETH_HLEN, mic);
@@ -1409,7 +1409,7 @@ static void orinoco_rx(struct net_device *dev,
skb_trim(skb, skb->len - MICHAEL_MIC_LEN);
length -= MICHAEL_MIC_LEN;
- michael_mic(priv->rx_tfm_mic,
+ orinoco_mic(priv->rx_tfm_mic,
priv->tkip_key[key_id].rx_mic,
desc->addr1,
src,
diff --git a/drivers/net/wireless/orinoco/mic.c b/drivers/net/wireless/orinoco/mic.c
index c39d9ea..8cdac75 100644
--- a/drivers/net/wireless/orinoco/mic.c
+++ b/drivers/net/wireless/orinoco/mic.c
@@ -16,18 +16,18 @@
/********************************************************************/
int orinoco_mic_init(struct orinoco_private *priv)
{
- priv->tx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
+ priv->tx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);
if (IS_ERR(priv->tx_tfm_mic)) {
printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
- "crypto API michael_mic\n");
+ "crypto API orinoco_mic\n");
priv->tx_tfm_mic = NULL;
return -ENOMEM;
}
- priv->rx_tfm_mic = crypto_alloc_hash("michael_mic", 0, 0);
+ priv->rx_tfm_mic = crypto_alloc_hash("orinoco_mic", 0, 0);
if (IS_ERR(priv->rx_tfm_mic)) {
printk(KERN_DEBUG "orinoco_mic_init: could not allocate "
- "crypto API michael_mic\n");
+ "crypto API orinoco_mic\n");
priv->rx_tfm_mic = NULL;
return -ENOMEM;
}
@@ -43,7 +43,7 @@ void orinoco_mic_free(struct orinoco_private *priv)
crypto_free_hash(priv->rx_tfm_mic);
}
-int michael_mic(struct crypto_hash *tfm_michael, u8 *key,
+int orinoco_mic(struct crypto_hash *tfm_michael, u8 *key,
u8 *da, u8 *sa, u8 priority,
u8 *data, size_t data_len, u8 *mic)
{
@@ -52,7 +52,7 @@ int michael_mic(struct crypto_hash *tfm_michael, u8 *key,
u8 hdr[ETH_HLEN + 2]; /* size of header + padding */
if (tfm_michael == NULL) {
- printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
+ printk(KERN_WARNING "orinoco_mic: tfm_michael == NULL\n");
return -1;
}
diff --git a/drivers/net/wireless/orinoco/mic.h b/drivers/net/wireless/orinoco/mic.h
index bc1db16..04d05bc 100644
--- a/drivers/net/wireless/orinoco/mic.h
+++ b/drivers/net/wireless/orinoco/mic.h
@@ -15,7 +15,7 @@ struct crypto_hash;
int orinoco_mic_init(struct orinoco_private *priv);
void orinoco_mic_free(struct orinoco_private *priv);
-int michael_mic(struct crypto_hash *tfm_michael, u8 *key,
+int orinoco_mic(struct crypto_hash *tfm_michael, u8 *key,
u8 *da, u8 *sa, u8 priority,
u8 *data, size_t data_len, u8 *mic);
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply related
* Re: next Feb 10: mm/slqb build break
From: Sachin P. Sant @ 2009-02-12 11:28 UTC (permalink / raw)
To: Nick Piggin
Cc: Pekka Enberg, Stephen Rothwell, linux-next, LKML, linuxppc-dev,
Benjamin Herrenschmidt
In-Reply-To: <20090212014503.GD30043@wotan.suse.de>
Nick Piggin wrote:
>> Actually, that's not the root cause here. You seem to have CONFIG_SMP
>> disabled but CONFIG_NUMA enabled. That's not possible on x86 which
>> makes me think it's a ppc kconfig bug. Hmm?
>>
>
> If it is really a valid config, then we should be able to make
> slqb build with it...
I am not sure if this is a valid config. According to arch/powerpc/Kconfig
NUMA depends on PPC64 and defaults to y if SMP & PPC_PSERIES is set.
If this is not a valid config then may be the make randconfig rules
need to be changed accordingly.
Ben should know. Ben ??
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply
* Re: next Feb 10: mm/slqb build break
From: Sachin P. Sant @ 2009-02-12 11:28 UTC (permalink / raw)
To: Nick Piggin
Cc: Pekka Enberg, Stephen Rothwell, linux-next, LKML, linuxppc-dev,
Benjamin Herrenschmidt
In-Reply-To: <20090212014503.GD30043@wotan.suse.de>
Nick Piggin wrote:
>> Actually, that's not the root cause here. You seem to have CONFIG_SMP
>> disabled but CONFIG_NUMA enabled. That's not possible on x86 which
>> makes me think it's a ppc kconfig bug. Hmm?
>>
>
> If it is really a valid config, then we should be able to make
> slqb build with it...
I am not sure if this is a valid config. According to arch/powerpc/Kconfig
NUMA depends on PPC64 and defaults to y if SMP & PPC_PSERIES is set.
If this is not a valid config then may be the make randconfig rules
need to be changed accordingly.
Ben should know. Ben ??
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply
* Re: next Feb 10: mm/slqb build break
From: Sachin P. Sant @ 2009-02-12 11:28 UTC (permalink / raw)
To: Nick Piggin
Cc: Stephen Rothwell, LKML, linuxppc-dev, Pekka Enberg, linux-next
In-Reply-To: <20090212014503.GD30043@wotan.suse.de>
Nick Piggin wrote:
>> Actually, that's not the root cause here. You seem to have CONFIG_SMP
>> disabled but CONFIG_NUMA enabled. That's not possible on x86 which
>> makes me think it's a ppc kconfig bug. Hmm?
>>
>
> If it is really a valid config, then we should be able to make
> slqb build with it...
I am not sure if this is a valid config. According to arch/powerpc/Kconfig
NUMA depends on PPC64 and defaults to y if SMP & PPC_PSERIES is set.
If this is not a valid config then may be the make randconfig rules
need to be changed accordingly.
Ben should know. Ben ??
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply
* next-20090212: drivers/watchdog/ks8695_wdt.c:68: error: 'CLOCK_TICK_RATE' undeclared (first use in this function)
From: Alexey Dobriyan @ 2009-02-12 10:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, wim
In-Reply-To: <20090212194408.ff7489c1.sfr@canb.auug.org.au>
On arm-acs5k_tiny:
drivers/watchdog/ks8695_wdt.c:68: error: 'CLOCK_TICK_RATE' undeclared (first use in this function)
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -21,6 +21,7 @@
#include <linux/watchdog.h>
#include <linux/io.h>
#include <linux/uaccess.h>
+#include <mach/timex.h>
#include <mach/regs-timer.h>
#define WDT_DEFAULT_TIME 5 /* seconds */
^ permalink raw reply
* linux-next: Tree for February 12
From: Stephen Rothwell @ 2009-02-12 8:44 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8591 bytes --]
Hi all,
Changes since 20090211:
The net tree gained 2 conflicts against the net-current tree.
The kmemcheck tree gained 2 conflicts against the x86 tree.
The wireless tree gained a build failure that caused me to revert several
of its commits.
----------------------------------------------------------------------------
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,
ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 133 trees (counting Linus' and 18 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 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/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
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/setup.h
CONFLICT (content): Merge conflict in fs/btrfs/locking.c
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree.
CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree.
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
$ git rm -f arch/x86/include/asm/es7000/apic.h
$ git rm -f arch/x86/include/asm/numaq/apic.h
Applying: rr: fixup for cpumask:remove-address-of-CPU_MASK_ALL
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable_64.h
CONFLICT (content): Merge conflict in mm/Makefile
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_memory.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging quilt/staging
Merging scsi-post-merge/master
Created commit b6349c2: Revert "orinoco: Storage class should be before const qualifier"
Created commit ed58c78: Revert "orinoco: hermes doesn't need to be a separate module"
Created commit c52856e: Revert "orinoco: hermes_dld does not need to be a module"
Created commit ee9a469: Revert "orinoco: Move WEXT handlers into a separate file"
Created commit e668502: Revert "orinoco: Move hardware functions into separate file"
Created commit d8d7390: Revert "orinoco: Add hardware function to set multicast mode"
Created commit 6a4d487: Revert "orinoco: Use accessor functions for bitrate tables"
Created commit ecac0c1: Revert "orinoco: Move firmware handling into a separate file"
Created commit d2cf8c5: Revert "orinoco: Move MIC helpers into new file"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: wireless tree build failure
From: Stephen Rothwell @ 2009-02-12 8:35 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, David Kilroy
[-- Attachment #1: Type: text/plain, Size: 1525 bytes --]
Hi John,
Today's linux-next build (powerpc allyesconfig) failed like this:
net/built-in.o: In function `michael_mic':
(.opd+0x3ba78): multiple definition of `michael_mic'
drivers/built-in.o:(.opd+0x552a8): first defined here
net/built-in.o: In function `michael_mic':
net/mac80211/michael.c:58: multiple definition of `.michael_mic'
drivers/built-in.o:drivers/net/wireless/orinoco/mic.c:49: first defined here
Immediate cause is commit 84875201dd1150dc2c16780b944fe501d588ffba
("orinoco: Move MIC helpers into new file").
I have reverted that commit (and several following ones that conflicted
with the revert - see below) for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Created commit b6349c2: Revert "orinoco: Storage class should be before const qualifier"
Created commit ed58c78: Revert "orinoco: hermes doesn't need to be a separate module"
Created commit c52856e: Revert "orinoco: hermes_dld does not need to be a module"
Created commit ee9a469: Revert "orinoco: Move WEXT handlers into a separate file"
Created commit e668502: Revert "orinoco: Move hardware functions into separate file"
Created commit d8d7390: Revert "orinoco: Add hardware function to set multicast mode"
Created commit 6a4d487: Revert "orinoco: Use accessor functions for bitrate tables"
Created commit ecac0c1: Revert "orinoco: Move firmware handling into a separate file"
Created commit d2cf8c5: Revert "orinoco: Move MIC helpers into new file"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* [PATCH] ext4: Initialize list properly
From: Aneesh Kumar K.V @ 2009-02-12 7:05 UTC (permalink / raw)
To: linux-kernel, tytso; +Cc: linux-ext4, linux-next, Aneesh Kumar K.V
In-Reply-To: <a4423d670902100906q36e7f36fo53ba2060f5644303@mail.gmail.com>
We need to initialize the list_head properly before we add
them to the any list. Otherwise with list debug on we get
list corruption warnings.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
fs/ext4/mballoc.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index deba54f..0e9155a 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -3693,6 +3693,8 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
pa->pa_free = pa->pa_len;
atomic_set(&pa->pa_count, 1);
spin_lock_init(&pa->pa_lock);
+ INIT_LIST_HEAD(&pa->pa_inode_list);
+ INIT_LIST_HEAD(&pa->pa_group_list);
pa->pa_deleted = 0;
pa->pa_linear = 0;
@@ -3755,6 +3757,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
atomic_set(&pa->pa_count, 1);
spin_lock_init(&pa->pa_lock);
INIT_LIST_HEAD(&pa->pa_inode_list);
+ INIT_LIST_HEAD(&pa->pa_group_list);
pa->pa_deleted = 0;
pa->pa_linear = 1;
--
tg: (b578f3f..) fix_list_corruption (depends on: master)
^ permalink raw reply related
* linux-next: manual merge of the kmemcheck tree with the tree
From: Stephen Rothwell @ 2009-02-12 5:38 UTC (permalink / raw)
To: Vegard Nossum, Pekka Enberg, Ingo Molnar; +Cc: linux-next, Jeremy Fitzhardinge
[-- Attachment #1: Type: text/plain, Size: 468 bytes --]
Hi all,
Today's linux-next merge of the kmemcheck tree got conflicts in
arch/x86/include/asm/pgtable_32.h arch/x86/include/asm/pgtable_64.h
between the unification commits in the x86 tree and commit
5faef0d73631a368f375a5b852e7149f44542670 ("Merge commit 'v2.6.28-rc2'
into kmemcheck") from the kmemcheck tree.
I used the resolution from tip/master.
--
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 the net-current tree
From: Stephen Rothwell @ 2009-02-12 2:46 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, Reinette Chatre, John W. Linville
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
Hi David,
Today's linux-next merge of the net tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-agn.c and
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
89c581b3fb2986e303f1299e6458e3e9b115fa3f ("iwlwifi: fix suspend/resume
and its usage of pci saved state") from the net-current tree and commits
from the net tree.
I assume this is what John was referring to when he said:
> The iwlwifi patch corrects a problem (introduced by the previous iwlwifi
> fix) that disables the iwlwifi devices after suspend/resume. It will
> conflict with what is already in -next -- just take the hunks that are
> already in -next and ignore the hunks introduced here.
So I took that advise.
--
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: next Feb 10: mm/slqb build break
From: David Miller @ 2009-02-12 1:47 UTC (permalink / raw)
To: npiggin; +Cc: penberg, sachinp, sfr, linux-next, linux-kernel, linuxppc-dev
In-Reply-To: <20090212014503.GD30043@wotan.suse.de>
From: Nick Piggin <npiggin@suse.de>
Date: Thu, 12 Feb 2009 02:45:03 +0100
> On Tue, Feb 10, 2009 at 01:53:51PM +0200, Pekka Enberg wrote:
> > Actually, that's not the root cause here. You seem to have CONFIG_SMP
> > disabled but CONFIG_NUMA enabled. That's not possible on x86 which
> > makes me think it's a ppc kconfig bug. Hmm?
>
> If it is really a valid config, then we should be able to make
> slqb build with it...
FWIW I only allow NUMA with SMP on sparc64, just like x86.
Although it seems IA64, like powerpc, does not have this restriction.
Hmmm...
^ permalink raw reply
* Re: next Feb 10: mm/slqb build break
From: Nick Piggin @ 2009-02-12 1:45 UTC (permalink / raw)
To: Pekka Enberg
Cc: Sachin P. Sant, Stephen Rothwell, linux-next, LKML, linuxppc-dev
In-Reply-To: <84144f020902100353x4074f342ne4d61483074a06b7@mail.gmail.com>
On Tue, Feb 10, 2009 at 01:53:51PM +0200, Pekka Enberg wrote:
> On Tue, Feb 10, 2009 at 11:54 AM, Sachin P. Sant <sachinp@in.ibm.com> wrote:
> > Sachin P. Sant wrote:
> >>
> >> Hi Stephen,
> >>
> >> Todays next randconfig build on powerpc fails with
> >>
> >> CC mm/slqb.o
> >> mm/slqb.c: In function __slab_free:
> >> mm/slqb.c:1648: error: implicit declaration of function
> >> slab_free_to_remote
> >> mm/slqb.c: In function kmem_cache_open:
> >> mm/slqb.c:2174: error: implicit declaration of function
> >> kmem_cache_dyn_array_free
> >> mm/slqb.c:2175: warning: label error_cpu_array defined but not used
> >> mm/slqb.c: In function kmem_cache_destroy:
> >> mm/slqb.c:2294: error: implicit declaration of function
> >> claim_remote_free_list
> >> mm/slqb.c: In function kmem_cache_reap_percpu:
> >> mm/slqb.c:2547: error: implicit declaration of function
> >> flush_remote_free_cache
> >> mm/slqb.c: In function kmem_cache_init:
> >> mm/slqb.c:2783: error: per_cpu__kmem_cpu_nodes undeclared (first use in
> >> this function)
> >> mm/slqb.c:2783: error: (Each undeclared identifier is reported only once
> >> mm/slqb.c:2783: error: for each function it appears in.)
> >> mm/slqb.c:2784: error: kmem_cpu_cache undeclared (first use in this
> >> function)
> >> make[1]: *** [mm/slqb.o] Error 1
> >> make: *** [mm] Error 2
> >
> > CONFIG_SMP is not set hence the failure.
>
> Actually, that's not the root cause here. You seem to have CONFIG_SMP
> disabled but CONFIG_NUMA enabled. That's not possible on x86 which
> makes me think it's a ppc kconfig bug. Hmm?
If it is really a valid config, then we should be able to make
slqb build with it...
^ 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