* linux-next: manual merge of the percpu tree with Linus' tree
@ 2009-07-01 7:19 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2009-07-01 7:19 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 570 bytes --]
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/alpha/include/asm/percpu.h between commit
b01e8dc34379f4ba2f454390e340a025edbaaa7e ("alpha: fix percpu build
breakage") from Linus' tree and commit
6088464cf1ae9fb3d2ccc0ec5feb3f5b971098d8 ("alpha: kill unnecessary __used
attribute in PER_CPU_ATTRIBUTES") from the percpu tree.
The latter just removes what the former changed, so I used the percpu
tree version of this file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the percpu tree with Linus' tree
2009-10-30 10:02 ` Tejun Heo
@ 2009-10-31 4:23 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2009-10-31 4:23 UTC (permalink / raw)
To: Tejun Heo
Cc: Rusty Russell, Christoph Lameter, Ingo Molnar, linux-next,
linux-kernel, Jiri Kosina
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
HI Tejun,
On Fri, 30 Oct 2009 11:02:25 +0100 Tejun Heo <tj@kernel.org> wrote:
>
> I'll pull master into for-next in a few days so that we can do sparse
> cleanup pass over the whole tree on the latest tree.
Great, thanks.
--
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] 9+ messages in thread
* Re: linux-next: manual merge of the percpu tree with Linus' tree
2009-10-30 8:20 Stephen Rothwell
@ 2009-10-30 10:02 ` Tejun Heo
2009-10-31 4:23 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Tejun Heo @ 2009-10-30 10:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rusty Russell, Christoph Lameter, Ingo Molnar, linux-next,
linux-kernel, Jiri Kosina
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
> between commit 403a91b1659cb149dbddc5885f892734ae4542d8 ("percpu: allow
> pcpu_alloc() to be called with IRQs off") from Linus' tree and commit
> 0f5e4816dbf38ce9488e611ca2296925c1e90d5e ("percpu: remove some sparse
> warnings") from the percpu tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
I'll pull master into for-next in a few days so that we can do sparse
cleanup pass over the whole tree on the latest tree.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the percpu tree with Linus' tree
@ 2009-10-30 8:20 Stephen Rothwell
2009-10-30 10:02 ` Tejun Heo
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2009-10-30 8:20 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, Jiri Kosina
Hi all,
Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
between commit 403a91b1659cb149dbddc5885f892734ae4542d8 ("percpu: allow
pcpu_alloc() to be called with IRQs off") from Linus' tree and commit
0f5e4816dbf38ce9488e611ca2296925c1e90d5e ("percpu: remove some sparse
warnings") from the percpu tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc mm/percpu.c
index d907971,e2e80fc..0000000
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@@ -369,7 -364,8 +367,8 @@@ static struct pcpu_chunk *pcpu_chunk_ad
* RETURNS:
* 0 if noop, 1 if successfully extended, -errno on failure.
*/
-static int pcpu_extend_area_map(struct pcpu_chunk *chunk)
+static int pcpu_extend_area_map(struct pcpu_chunk *chunk, unsigned long *flags)
+ __releases(lock) __acquires(lock)
{
int new_alloc;
int *new;
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the percpu tree with Linus' tree
2009-09-07 8:36 ` Tejun Heo
@ 2009-09-07 10:24 ` Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2009-09-07 10:24 UTC (permalink / raw)
To: Tejun Heo
Cc: Rusty Russell, Christoph Lameter, Ingo Molnar, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
Hi Tejun,
On Mon, 07 Sep 2009 17:36:56 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Stephen Rothwell wrote:
> >
> > I *think* the changes in the percpu tree supercede those in Linus' tree,
> > so I have used those.
>
> Yes, the changes in Linus's tree are backported from devel branch but
> the devel already has moved on and dropped one of the changes. I'll
> merge Linus's tree into percpu devel branch.
Thanks for the confirmation.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: linux-next: manual merge of the percpu tree with Linus' tree
2009-09-07 8:22 Stephen Rothwell
@ 2009-09-07 8:36 ` Tejun Heo
2009-09-07 10:24 ` Stephen Rothwell
0 siblings, 1 reply; 9+ messages in thread
From: Tejun Heo @ 2009-09-07 8:36 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rusty Russell, Christoph Lameter, Ingo Molnar, linux-next, linux-kernel
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
> between commit 04a13c7c632e1fe04a5f6e6c83565d2559e37598 ("percpu: don't
> assume existence of cpu0") from Linus' tree and commit pcpu_chunk_page_occupied ("percpu: drop pcpu_chunk->page[]") from the percpu tree.
>
> I *think* the changes in the percpu tree supercede those in Linus' tree,
> so I have used those.
Yes, the changes in Linus's tree are backported from devel branch but
the devel already has moved on and dropped one of the changes. I'll
merge Linus's tree into percpu devel branch.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the percpu tree with Linus' tree
@ 2009-09-07 8:22 Stephen Rothwell
2009-09-07 8:36 ` Tejun Heo
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2009-09-07 8:22 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
Hi all,
Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
between commit 04a13c7c632e1fe04a5f6e6c83565d2559e37598 ("percpu: don't
assume existence of cpu0") from Linus' tree and commit pcpu_chunk_page_occupied ("percpu: drop pcpu_chunk->page[]") from the percpu tree.
I *think* the changes in the percpu tree supercede those in Linus' tree,
so I have used those.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the percpu tree with Linus' tree
@ 2009-07-01 7:25 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2009-07-01 7:25 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 558 bytes --]
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
include/linux/percpu-defs.h between commit
b01e8dc34379f4ba2f454390e340a025edbaaa7e ("alpha: fix percpu build
breakage") from Linus' tree and commit
7c756e6e19e71f0327760d8955f7077118ebb2b1 ("percpu: implement optional
weak percpu definitions") from the percpu tree.
The latter seems to subsume the former changes, so I just used the percpu
tree version of this file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* linux-next: manual merge of the percpu tree with Linus' tree
@ 2009-06-29 5:33 Stephen Rothwell
0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2009-06-29 5:33 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, David Howells
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/mn10300/kernel/vmlinux.lds.S between commit
2e8b5a09ebf1f98f02c1988a48415e89d4c25168 ("MN10300: Fix the vmlinux
ldscript") from Linus' tree and commit
405d967dc70002991f8fc35c20e0d3cbc7614f63 ("linker script: throw
away .discard section") from the percpu tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/mn10300/kernel/vmlinux.lds.S
index c96ba3d,5d9f2f9..0000000
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@@ -117,7 -145,8 +117,8 @@@ SECTION
/* Sections to be discarded */
/DISCARD/ : {
- *(.exitcall.exit)
+ EXIT_CALL
+ *(.discard)
}
STABS_DEBUG
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-10-31 4:23 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-07-01 7:19 linux-next: manual merge of the percpu tree with Linus' tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-10-30 8:20 Stephen Rothwell
2009-10-30 10:02 ` Tejun Heo
2009-10-31 4:23 ` Stephen Rothwell
2009-09-07 8:22 Stephen Rothwell
2009-09-07 8:36 ` Tejun Heo
2009-09-07 10:24 ` Stephen Rothwell
2009-07-01 7:25 Stephen Rothwell
2009-06-29 5:33 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).