linux-next: manual merge of the percpu tree with the net tree

linux-next: manual merge of the percpu tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
net/ipv6/proc.c between commit 5833929cc2ad2b3064b4fac8c44e293972d240d8
("net: constify MIB name tables") from the net tree and commit
d3f5fa4075414c7754126fbdc7c8fbd3906db7c8 ("percpu: add __percpu sparse
annotations to net") from the percpu tree.

I fixed it up (see below) and can carry the fix as necessary.

Maybe you guys could send Linus a simple one line patch for v2.6.33 that
adds

#define __percpu

to include/linux/compiler.h (unconditionally) and then farm out the
patches that add the __percpu annotations to other maintainers.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv6/proc.c
index bfe2598,e3744d1..0000000
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@@ -170,8 -170,9 +170,8 @@@ static void snmp6_seq_show_icmpv6msg(st
  	return;
  }
  
- static void snmp6_seq_show_item(struct seq_file *seq, void **mib,
 -static inline void
 -snmp6_seq_show_item(struct seq_file *seq, void __percpu **mib,
 -		    struct snmp_mib *itemlist)
++static void snmp6_seq_show_item(struct seq_file *seq, void __percpu **mib,
 +				const struct snmp_mib *itemlist)
  {
  	int i;
  	for (i=0; itemlist[i].name; i++)

Re: linux-next: manual merge of the percpu tree with the net tree

[Tejun Heo]

Hello,

On 02/03/2010 02:38 PM, Stephen Rothwell wrote:
> Today's linux-next merge of the percpu tree got a conflict in
> net/ipv6/proc.c between commit 5833929cc2ad2b3064b4fac8c44e293972d240d8
> ("net: constify MIB name tables") from the net tree and commit
> d3f5fa4075414c7754126fbdc7c8fbd3906db7c8 ("percpu: add __percpu sparse
> annotations to net") from the percpu tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.
> 
> Maybe you guys could send Linus a simple one line patch for v2.6.33 that
> adds
> 
> #define __percpu
> 
> to include/linux/compiler.h (unconditionally) and then farm out the
> patches that add the __percpu annotations to other maintainers.

How about just adding dummy #define __percpu in each tree?  I don't
think git will have much problem merging them.

-- 
tejun

linux-next: manual merge of the percpu tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
drivers/net/macvlan.c between commit
fc0663d6b5e6d8e9b57f872a644c0aafd82361b7 ("macvlan: allow multiple driver
backends") from the net tree and commit
e20b68160144bcacbde008b9cf7df4e1544b2507 ("percpu: add __percpu sparse
annotations to net drivers") from the percpu tree.

The struct that is being modified by the latter commit has been moved by
the former into include/linux/if_macvlan.h.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Feb 2010 15:29:35 +1100
Subject: [PATCH] percpu: macvlan merge fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/if_macvlan.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index 51f1512..f9cb9ba 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -30,7 +30,7 @@ struct macvlan_dev {
 	struct hlist_node	hlist;
 	struct macvlan_port	*port;
 	struct net_device	*lowerdev;
-	struct macvlan_rx_stats *rx_stats;
+	struct macvlan_rx_stats __percpu *rx_stats;
 	enum macvlan_mode	mode;
 	int (*receive)(struct sk_buff *skb);
 	int (*forward)(struct net_device *dev, struct sk_buff *skb);
-- 
1.6.6.1