* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-11 23:40 mmotm 2010-06-11-16-40 uploaded akpm
@ 2010-06-12 0:22 ` Andrew Morton
2010-06-12 1:31 ` Randy Dunlap
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Andrew Morton @ 2010-06-12 0:22 UTC (permalink / raw)
To: mm-commits, linux-kernel
On Fri, 11 Jun 2010 16:40:13 -0700
akpm@linux-foundation.org wrote:
> The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
>
> http://userweb.kernel.org/~akpm/mmotm/
>
> and will soon be available at
>
> git://zen-kernel.org/kernel/mmotm.git
This oopses for me in get_ksymbol() (a linux-next bug). I didn't have
time to find out why. But presumably it isn't oopsing for other
linux-next testers.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-11 23:40 mmotm 2010-06-11-16-40 uploaded akpm
2010-06-12 0:22 ` Andrew Morton
@ 2010-06-12 1:31 ` Randy Dunlap
2010-06-12 1:48 ` Andrew Morton
2010-06-12 2:43 ` Dave Young
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Randy Dunlap @ 2010-06-12 1:31 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm
On Fri, 11 Jun 2010 16:40:13 -0700 akpm@linux-foundation.org wrote:
> The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
>
> http://userweb.kernel.org/~akpm/mmotm/
>
> and will soon be available at
>
> git://zen-kernel.org/kernel/mmotm.git
>
> It contains the following patches against 2.6.35-rc2:
> mm-extend-ksm-refcounts-to-the-anon_vma-root.patch
> mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch
latter patch file contains patches to mm/rmap.c.orig,
which patch FAILs to apply:
Applying patch mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch
patching file mm/rmap.c
patching file mm/rmap.c.orig
Hunk #1 FAILED at 236.
Hunk #2 succeeded at 253 with fuzz 2 (offset -12 lines).
Hunk #3 succeeded at 1343 (offset -58 lines).
1 out of 3 hunks FAILED -- rejects in file mm/rmap.c.orig
Patch mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch does not apply (enforce with -f)
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-12 1:31 ` Randy Dunlap
@ 2010-06-12 1:48 ` Andrew Morton
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Morton @ 2010-06-12 1:48 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-kernel
On Fri, 11 Jun 2010 18:31:52 -0700 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> On Fri, 11 Jun 2010 16:40:13 -0700 akpm@linux-foundation.org wrote:
>
> > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
> >
> > http://userweb.kernel.org/~akpm/mmotm/
> >
> > and will soon be available at
> >
> > git://zen-kernel.org/kernel/mmotm.git
> >
> > It contains the following patches against 2.6.35-rc2:
>
> > mm-extend-ksm-refcounts-to-the-anon_vma-root.patch
> > mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch
>
> latter patch file contains patches to mm/rmap.c.orig,
> which patch FAILs to apply:
Geeze I hate it when people do that. My "work out what files are added
or removed or altered by a patch" script needs fixing.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-11 23:40 mmotm 2010-06-11-16-40 uploaded akpm
2010-06-12 0:22 ` Andrew Morton
2010-06-12 1:31 ` Randy Dunlap
@ 2010-06-12 2:43 ` Dave Young
2010-06-12 2:54 ` Andrew Morton
2010-06-12 8:50 ` mmotm 2010-06-11-16-40 uploaded - busticated patch? Valdis.Kletnieks
2010-06-12 15:37 ` mmotm 2010-06-11-16-40 uploaded Stephen Rothwell
4 siblings, 1 reply; 11+ messages in thread
From: Dave Young @ 2010-06-12 2:43 UTC (permalink / raw)
To: akpm; +Cc: mm-commits, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
On Sat, Jun 12, 2010 at 7:40 AM, <akpm@linux-foundation.org> wrote:
> The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
>
> http://userweb.kernel.org/~akpm/mmotm/
>
> and will soon be available at
>
> git://zen-kernel.org/kernel/mmotm.git
>
Hi, andrew
building failed with:
AS arch/x86/kernel/entry_32.o
/home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h: Assembler messages:
/home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:29: Error:
no such instruction: `static inline void
olpc_ofw_detect_range(void){}'
make[2]: *** [arch/x86/kernel/entry_32.o] Error 1
make[1]: *** [arch/x86/kernel] Error 2
make: *** [arch/x86] Error 2
Attached a patch to fix it (I have not appropriate email client now,
sorry for the inconvenience )
[-- Attachment #2: hidave_build_fix.patch --]
[-- Type: application/octet-stream, Size: 608 bytes --]
add "ifndef __ASSEMBLER__" to fix build warnings
Fix build failing of olpc_ofw.h
Add ifndef __ASSEMBLER__ around the function declaration
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
---
arch/x86/include/asm/olpc_ofw.h | 2 ++
1 file changed, 2 insertions(+)
--- linux-2.6.35.orig/arch/x86/include/asm/olpc_ofw.h 2010-06-12 09:57:52.000000000 +0800
+++ linux-2.6.35/arch/x86/include/asm/olpc_ofw.h 2010-06-12 10:15:58.480000349 +0800
@@ -26,7 +26,9 @@ void olpc_ofw_detect_range(void);
#else
+#ifndef __ASSEMBLER__
static inline void olpc_ofw_detect_range(void) { }
+#endif
#endif
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-12 2:43 ` Dave Young
@ 2010-06-12 2:54 ` Andrew Morton
2010-06-12 5:59 ` Andres Salomon
0 siblings, 1 reply; 11+ messages in thread
From: Andrew Morton @ 2010-06-12 2:54 UTC (permalink / raw)
To: Dave Young; +Cc: linux-kernel, Andres Salomon
On Sat, 12 Jun 2010 10:43:31 +0800 Dave Young <hidave.darkstar@gmail.com> wrote:
> On Sat, Jun 12, 2010 at 7:40 AM, <akpm@linux-foundation.org> wrote:
> > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
> >
> > __ http://userweb.kernel.org/~akpm/mmotm/
> >
> > and will soon be available at
> >
> > __ git://zen-kernel.org/kernel/mmotm.git
> >
>
> Hi, andrew
>
> building failed with:
> AS arch/x86/kernel/entry_32.o
> /home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h: Assembler messages:
> /home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:29: Error:
> no such instruction: `static inline void
> olpc_ofw_detect_range(void){}'
> make[2]: *** [arch/x86/kernel/entry_32.o] Error 1
> make[1]: *** [arch/x86/kernel] Error 2
> make: *** [arch/x86] Error 2
>
> Attached a patch to fix it (I have not appropriate email client now,
> sorry for the inconvenience )
Thanks.
We can simplify things a bit I think...
#ifndef _ASM_X86_OLPC_OFW_H
#define _ASM_X86_OLPC_OFW_H
/* hardcode addresses to make life easier dealing w/ VMALLOC_END and others */
#define OLPC_OFW_START 0xff800000UL
#define OLPC_OFW_SIZE (PGDIR_SIZE)
#define OLPC_OFW_END (OLPC_OFW_START + OLPC_OFW_SIZE)
#ifndef __ASSEMBLER__
#ifdef CONFIG_OLPC_OPENFIRMWARE
/* address of OFW callback interface; will be NULL if OFW isn't found */
extern int (*olpc_ofw_cif)(int *);
/* page dir entry containing OFW's current memory */
extern pgdval_t olpc_ofw_pgd;
/* run an OFW command by calling into the firmware */
extern int olpc_ofw(const char *name, int nr_args, int nr_res, ...);
/* determine/ensure OFW lives in the proper place in (virtual) memory */
void olpc_ofw_detect_range(void);
#else /* CONFIG_OLPC_OPENFIRMWARE */
static inline void olpc_ofw_detect_range(void) { }
#endif /* CONFIG_OLPC_OPENFIRMWARE */
#endif /* __ASSEMBLER__ */
#endif
--- a/arch/x86/include/asm/olpc_ofw.h~x86-olpc-add-support-for-calling-into-openfirmware-fix-fix
+++ a/arch/x86/include/asm/olpc_ofw.h
@@ -6,10 +6,10 @@
#define OLPC_OFW_SIZE (PGDIR_SIZE)
#define OLPC_OFW_END (OLPC_OFW_START + OLPC_OFW_SIZE)
-#ifdef CONFIG_OLPC_OPENFIRMWARE
-
#ifndef __ASSEMBLER__
+#ifdef CONFIG_OLPC_OPENFIRMWARE
+
/* address of OFW callback interface; will be NULL if OFW isn't found */
extern int (*olpc_ofw_cif)(int *);
@@ -22,14 +22,12 @@ extern int olpc_ofw(const char *name, in
/* determine/ensure OFW lives in the proper place in (virtual) memory */
void olpc_ofw_detect_range(void);
-#endif
-
-#else
+#else /* CONFIG_OLPC_OPENFIRMWARE */
-#ifndef __ASSEMBLER__
static inline void olpc_ofw_detect_range(void) { }
-#endif
-#endif
+#endif /* CONFIG_OLPC_OPENFIRMWARE */
+
+#endif /* __ASSEMBLER__ */
#endif
_
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-12 2:54 ` Andrew Morton
@ 2010-06-12 5:59 ` Andres Salomon
0 siblings, 0 replies; 11+ messages in thread
From: Andres Salomon @ 2010-06-12 5:59 UTC (permalink / raw)
To: Andrew Morton; +Cc: Dave Young, linux-kernel
On Fri, 11 Jun 2010 19:54:21 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:
> On Sat, 12 Jun 2010 10:43:31 +0800 Dave Young
> <hidave.darkstar@gmail.com> wrote:
>
> > On Sat, Jun 12, 2010 at 7:40 AM, <akpm@linux-foundation.org> wrote:
> > > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded
> > > to
> > >
> > > __ http://userweb.kernel.org/~akpm/mmotm/
> > >
> > > and will soon be available at
> > >
> > > __ git://zen-kernel.org/kernel/mmotm.git
> > >
> >
> > Hi, andrew
> >
> > building failed with:
> > AS arch/x86/kernel/entry_32.o
> > /home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:
> > Assembler
> > messages: /home/dave/src/linux-2.6.35/arch/x86/include/asm/olpc_ofw.h:29:
> > Error: no such instruction: `static inline void
> > olpc_ofw_detect_range(void){}' make[2]: ***
> > [arch/x86/kernel/entry_32.o] Error 1 make[1]: *** [arch/x86/kernel]
> > Error 2 make: *** [arch/x86] Error 2
> >
> > Attached a patch to fix it (I have not appropriate email client now,
> > sorry for the inconvenience )
>
> Thanks.
>
> We can simplify things a bit I think...
>
> #ifndef _ASM_X86_OLPC_OFW_H
> #define _ASM_X86_OLPC_OFW_H
>
> /* hardcode addresses to make life easier dealing w/ VMALLOC_END and
> others */ #define OLPC_OFW_START 0xff800000UL
> #define OLPC_OFW_SIZE (PGDIR_SIZE)
> #define OLPC_OFW_END (OLPC_OFW_START + OLPC_OFW_SIZE)
>
> #ifndef __ASSEMBLER__
>
> #ifdef CONFIG_OLPC_OPENFIRMWARE
>
> /* address of OFW callback interface; will be NULL if OFW isn't found
> */ extern int (*olpc_ofw_cif)(int *);
>
> /* page dir entry containing OFW's current memory */
> extern pgdval_t olpc_ofw_pgd;
>
> /* run an OFW command by calling into the firmware */
> extern int olpc_ofw(const char *name, int nr_args, int nr_res, ...);
>
> /* determine/ensure OFW lives in the proper place in (virtual) memory
> */ void olpc_ofw_detect_range(void);
>
> #else /* CONFIG_OLPC_OPENFIRMWARE */
>
> static inline void olpc_ofw_detect_range(void) { }
>
> #endif /* CONFIG_OLPC_OPENFIRMWARE */
>
> #endif /* __ASSEMBLER__ */
>
> #endif
>
Thanks, I've changed it to something similar in my git tree. It'll be
in the next patch (once I've addressed hpa's concerns).
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: mmotm 2010-06-11-16-40 uploaded - busticated patch?
2010-06-11 23:40 mmotm 2010-06-11-16-40 uploaded akpm
` (2 preceding siblings ...)
2010-06-12 2:43 ` Dave Young
@ 2010-06-12 8:50 ` Valdis.Kletnieks
2010-06-12 15:37 ` mmotm 2010-06-11-16-40 uploaded Stephen Rothwell
4 siblings, 0 replies; 11+ messages in thread
From: Valdis.Kletnieks @ 2010-06-12 8:50 UTC (permalink / raw)
To: Andrew Morton, Rik van Riel; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
On Fri, 11 Jun 2010 16:40:13 PDT, akpm@linux-foundation.org said:
> The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
>
> http://userweb.kernel.org/~akpm/mmotm/
mm-extend-ksm-refcounts-to-the-anon_vma-root-fix.patch contains this
hunk:
diff -puN mm/rmap.c.orig~mm-extend-ksm-refcounts-to-the-anon_vma-root-fix mm/rmap.c.orig
--- a/mm/rmap.c.orig~mm-extend-ksm-refcounts-to-the-anon_vma-root-fix
+++ a/mm/rmap.c.orig
which blows chunks because there's no rmap.c.orig in the tree. Not sure what
that section was supposed to do, or what it was supposed to apply to.
[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-11 23:40 mmotm 2010-06-11-16-40 uploaded akpm
` (3 preceding siblings ...)
2010-06-12 8:50 ` mmotm 2010-06-11-16-40 uploaded - busticated patch? Valdis.Kletnieks
@ 2010-06-12 15:37 ` Stephen Rothwell
2010-06-12 17:10 ` Andrew Morton
4 siblings, 1 reply; 11+ messages in thread
From: Stephen Rothwell @ 2010-06-12 15:37 UTC (permalink / raw)
To: akpm; +Cc: mm-commits, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 765 bytes --]
Hi Andrew,
On Fri, 11 Jun 2010 16:40:13 -0700 akpm@linux-foundation.org wrote:
>
> The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
>
> http://userweb.kernel.org/~akpm/mmotm/
>
> and will soon be available at
>
> git://zen-kernel.org/kernel/mmotm.git
The version in this git tree stops just before patch
scsi-remove-private-bit-macros.patch. I suspect that is because "git am"
doe not like that patch (it has "a/./drivers..." as the file names).
There are a few later patches that "git am" also does not like - because
either they have no commit message, no From: line, or do not apply
without some fuzz.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-12 15:37 ` mmotm 2010-06-11-16-40 uploaded Stephen Rothwell
@ 2010-06-12 17:10 ` Andrew Morton
2010-06-13 3:38 ` Stephen Rothwell
0 siblings, 1 reply; 11+ messages in thread
From: Andrew Morton @ 2010-06-12 17:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-kernel
On Sun, 13 Jun 2010 01:37:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> On Fri, 11 Jun 2010 16:40:13 -0700 akpm@linux-foundation.org wrote:
> >
> > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
> >
> > http://userweb.kernel.org/~akpm/mmotm/
> >
> > and will soon be available at
> >
> > git://zen-kernel.org/kernel/mmotm.git
>
> The version in this git tree stops just before patch
> scsi-remove-private-bit-macros.patch. I suspect that is because "git am"
> doe not like that patch (it has "a/./drivers..." as the file names).
git bug. I fixed the patch.
> There are a few later patches that "git am" also does not like - because
> either they have no commit message
That should be OK - we often have unchangelogged patches. Real simple ones.
>, no From: line,
Well. What From: line do I put on origin.patch and linux-next.patch??
I fixed the others.
> or do not apply
> without some fuzz.
That's a bit silly. Oh well, I can try to remember to rediff
everything before uploading.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: mmotm 2010-06-11-16-40 uploaded
2010-06-12 17:10 ` Andrew Morton
@ 2010-06-13 3:38 ` Stephen Rothwell
0 siblings, 0 replies; 11+ messages in thread
From: Stephen Rothwell @ 2010-06-13 3:38 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1401 bytes --]
Hi Andrew,
On Sat, 12 Jun 2010 10:10:14 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Sun, 13 Jun 2010 01:37:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > On Fri, 11 Jun 2010 16:40:13 -0700 akpm@linux-foundation.org wrote:
> > >
> > > The mm-of-the-moment snapshot 2010-06-11-16-40 has been uploaded to
> > >
> > > http://userweb.kernel.org/~akpm/mmotm/
> > >
> > > and will soon be available at
> > >
> > > git://zen-kernel.org/kernel/mmotm.git
> >
> > The version in this git tree stops just before patch
> > scsi-remove-private-bit-macros.patch. I suspect that is because "git am"
> > doe not like that patch (it has "a/./drivers..." as the file names).
>
> git bug. I fixed the patch.
Yeah, these comments were more reflections on the "import to git"
procedures than on the patches themselves.
> >, no From: line,
>
> Well. What From: line do I put on origin.patch and linux-next.patch??
They were not the problem (for me at least).
> I fixed the others.
Thanks.
> > or do not apply
> > without some fuzz.
>
> That's a bit silly. Oh well, I can try to remember to rediff
> everything before uploading.
Not really necessary, git am is a but anal in that regard (for good
reason usually).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread