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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
call module_free() from any context") from the net-next tree and commit
"ARM: net: bpf_jit: make code generation less dependent on struct
sk_filter" from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/net/bpf_jit_32.c
index f50d223,2dab3e6..0000000
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@@ -926,8 -926,32 +925,21 @@@ out
  	return;
  }
  
+ void bpf_jit_compile(struct sk_filter *fp)
+ {
+ 	struct jit_ctx ctx;
+ 
+ 	memset(&ctx, 0, sizeof(ctx));
+ 	ctx.prog_len = fp->len;
+ 	ctx.prog_insns = fp->insns;
+ 
+ 	__bpf_jit_compile(&ctx);
+ 	if (ctx.target)
+ 		fp->bpf_func = (void *)ctx.target;
+ }
+ 
 -static void bpf_jit_free_worker(struct work_struct *work)
 -{
 -	module_free(NULL, work);
 -}
 -
  void bpf_jit_free(struct sk_filter *fp)
  {
 -	struct work_struct *work;
 -
 -	if (fp->bpf_func != sk_run_filter) {
 -		work = (struct work_struct *)fp->bpf_func;
 -
 -		INIT_WORK(work, bpf_jit_free_worker);
 -		schedule_work(work);
 -	}
 +	if (fp->bpf_func != sk_run_filter)
 +		module_free(NULL, fp->bpf_func);
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
call module_free() from any context") from the net-next tree and commit
"ARM: net: bpf_jit: make code generation less dependent on struct
sk_filter" from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/net/bpf_jit_32.c
index f50d223,2dab3e6..0000000
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@@ -926,8 -926,32 +925,21 @@@ out
  	return;
  }
  
+ void bpf_jit_compile(struct sk_filter *fp)
+ {
+ 	struct jit_ctx ctx;
+ 
+ 	memset(&ctx, 0, sizeof(ctx));
+ 	ctx.prog_len = fp->len;
+ 	ctx.prog_insns = fp->insns;
+ 
+ 	__bpf_jit_compile(&ctx);
+ 	if (ctx.target)
+ 		fp->bpf_func = (void *)ctx.target;
+ }
+ 
 -static void bpf_jit_free_worker(struct work_struct *work)
 -{
 -	module_free(NULL, work);
 -}
 -
  void bpf_jit_free(struct sk_filter *fp)
  {
 -	struct work_struct *work;
 -
 -	if (fp->bpf_func != sk_run_filter) {
 -		work = (struct work_struct *)fp->bpf_func;
 -
 -		INIT_WORK(work, bpf_jit_free_worker);
 -		schedule_work(work);
 -	}
 +	if (fp->bpf_func != sk_run_filter)
 +		module_free(NULL, fp->bpf_func);
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Daniel Borkmann]

Hi Stephen,

On 05/21/2013 06:25 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
> call module_free() from any context") from the net-next tree and commit
> "ARM: net: bpf_jit: make code generation less dependent on struct
> sk_filter" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Also seccomp_jit_free() needs a change otherwise the kernel won't build
with CONFIG_SECCOMP_FILTER_JIT enabled since the work_struct is initialized
with the bpf_jit_free_worker() callback, which is no longer existent.

Do you want me to send you a patch?

Quite frankly, I don't like so much that {seccomp,bpf}_jit_compile() and
{seccomp,bpf}_jit_free() are almost idential functions and now both need
to be maintained with the same changes, but that's off-topic here.

Cheers,

Daniel

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 458 bytes --]

Hi Daniel,

On Tue, 21 May 2013 09:44:13 +0200 Daniel Borkmann <dborkman@redhat.com> wrote:
>
> Also seccomp_jit_free() needs a change otherwise the kernel won't build
> with CONFIG_SECCOMP_FILTER_JIT enabled since the work_struct is initialized
> with the bpf_jit_free_worker() callback, which is no longer existent.
> 
> Do you want me to send you a patch?

Yes, please.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Daniel Borkmann]

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

On 05/22/2013 01:54 AM, Stephen Rothwell wrote:
> Hi Daniel,
>
> On Tue, 21 May 2013 09:44:13 +0200 Daniel Borkmann <dborkman@redhat.com> wrote:
>>
>> Also seccomp_jit_free() needs a change otherwise the kernel won't build
>> with CONFIG_SECCOMP_FILTER_JIT enabled since the work_struct is initialized
>> with the bpf_jit_free_worker() callback, which is no longer existent.
>>
>> Do you want me to send you a patch?
>
> Yes, please.

In case this is still needed, patch attached. That should fix it.

[-- Attachment #2: 0001-arm-bpf_jit-fixup-build-error-in-seccomp_jit_free.patch --]
[-- Type: text/x-patch, Size: 1395 bytes --]

>From 72d68685f31b84f64826740cf3d33ba6d8d28ffc Mon Sep 17 00:00:00 2001
Message-Id: <72d68685f31b84f64826740cf3d33ba6d8d28ffc.1369214198.git.dborkman@redhat.com>
In-Reply-To: <cover.1369214198.git.dborkman@redhat.com>
References: <cover.1369214198.git.dborkman@redhat.com>
From: Daniel Borkmann <dborkman@redhat.com>
Date: Wed, 22 May 2013 11:12:31 +0200
Subject: [PATCH] arm: bpf_jit: fixup build error in seccomp_jit_free

bpf_jit_free_worker() no longer exist, so get seccomp_jit_free()
in line with bpf_jit_free().

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 arch/arm/net/bpf_jit_32.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
index 62aca35..3fe001d 100644
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -969,18 +969,9 @@ void seccomp_jit_compile(struct seccomp_filter *fp)
 
 void seccomp_jit_free(struct seccomp_filter *fp)
 {
-	struct work_struct *work;
 	void *bpf_func = seccomp_filter_get_bpf_func(fp);
 
-	if (bpf_func != sk_run_filter) {
-		/*
-		 * seccomp_jit_free() can be called from softirq; module_free()
-		 * requires process context.
-		 */
-		work = (struct work_struct *)bpf_func;
-
-		INIT_WORK(work, bpf_jit_free_worker);
-		schedule_work(work);
-	}
+	if (bpf_func != sk_run_filter)
+		module_free(NULL, bpf_func);
 }
 #endif
-- 
1.7.11.7

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1787 bytes --]

Hi all,

On Tue, 2 Jun 2020 19:30:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm tree got a conflict in:
> 
>   kernel/trace/bpf_trace.c
> 
> between commit:
> 
>   b36e62eb8521 ("bpf: Use strncpy_from_unsafe_strict() in bpf_seq_printf() helper")
> 
> from the net-next tree and patch:
> 
>   "bpf:bpf_seq_printf(): handle potentially unsafe format string better"
> 
> from the akpm tree.
> 
> I fixed it up (I just dropped the akpm tree patch (and its fix) for now)
> and can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

I also had to ad the below patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 2 Jun 2020 19:40:42 +1000
Subject: [PATCH] fix up for strncpy_from_unsafe_strict rename

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 kernel/trace/bpf_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index af4bca8343ad..0d88e9b24928 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -619,7 +619,7 @@ BPF_CALL_5(bpf_seq_printf, struct seq_file *, m, char *, fmt, u32, fmt_size,
 				goto out;
 			}
 
-			err = strncpy_from_unsafe_strict(bufs->buf[memcpy_cnt],
+			err = strncpy_from_kernel_nofault(bufs->buf[memcpy_cnt],
 							 (void *) (long) args[fmt_cnt],
 							 MAX_SEQ_PRINTF_STR_LEN);
 			if (err < 0)
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  kernel/trace/bpf_trace.c

between commit:

  b36e62eb8521 ("bpf: Use strncpy_from_unsafe_strict() in bpf_seq_printf() helper")

from the net-next tree and patch:

  "bpf:bpf_seq_printf(): handle potentially unsafe format string better"

from the akpm tree.

I fixed it up (I just dropped the akpm tree patch (and its fix) for now)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  net/ipv6/sysctl_net_ipv6.c

between commit:

  00dc3307c0f7 ("net/ipv6: Fix misuse of proc_dointvec "flowlabel_reflect"")

from the net-next tree and patch:

  "proc-sysctl-add-shared-variables-for-range-check-fix-2-fix"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/ipv6/sysctl_net_ipv6.c
index 57f520d1bf45,e00cf070e542..000000000000
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@@ -112,8 -112,8 +112,8 @@@ static struct ctl_table ipv6_table_temp
  		.data		= &init_net.ipv6.sysctl.flowlabel_reflect,
  		.maxlen		= sizeof(int),
  		.mode		= 0644,
 -		.proc_handler	= proc_dointvec,
 +		.proc_handler	= proc_dointvec_minmax,
- 		.extra1		= &zero,
+ 		.extra1		= SYSCTL_ZERO,
  		.extra2		= &flowlabel_reflect_max,
  	},
  	{

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  net/ipv6/route.c

between commit:

  6802f3adcb3f ("ipv6: Fix build with gcc-4.4.5")

from the net-next tree and patch:

  "net/ipv6/route.c: work around gcc-4.4.4 anon union initializer issue"

from the akpm tree.

I fixed it up (I just used the net-next tree version) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

  Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt

between commit:

  0ce5aa1d6c97 ("dt-bindings: net: update bcmgenet binding for GENETv5")

from the net-next tree and patch:

  "scripts/spelling.txt: Add regsiter -> register spelling mistake"

from the akpm tree.

I fixed it up (the former also fixed the typo from the latter, so I just
used that) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

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

[Stephen Rothwell]

Hi Marc,

On Tue, 7 Feb 2017 09:40:09 +0100 Marc Kleine-Budde <mkl@pengutronix.de> wrote:
>
> On 02/07/2017 06:23 AM, Stephen Rothwell wrote:
> > diff --cc drivers/net/can/flexcan.c
> > index ea57fed375c6,4dc71bce525c..000000000000
> > --- a/drivers/net/can/flexcan.c
> > +++ b/drivers/net/can/flexcan.c
> > @@@ -195,9 -189,7 +195,9 @@@
> >    */
> >   #define FLEXCAN_QUIRK_BROKEN_ERR_STATE	BIT(1) /* [TR]WRN_INT not connected */
> >   #define FLEXCAN_QUIRK_DISABLE_RXFG	BIT(2) /* Disable RX FIFO Global mask */
> >  -#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(3) /* Disable Memory error detection */
> >  +#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS	BIT(3) /* Enable EACEN and RRS bit in ctrl2 */
> > - #define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disble Memory error detection */
> > ++#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disbale Memory error detection */  
> 
>                                                   ^^^^^^^
> Should be "Disable". I'll send David Miller a fix for the typo.

The "Disbale" typo is only in my merge resolution :-(  I will fix it there.

-- 
Cheers,
Stephen Rothwell

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

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 2177 bytes --]

On 02/07/2017 06:23 AM, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in:
> 
>   drivers/net/can/flexcan.c
> 
> between commits:
> 
>   9eb7aa891101 ("can: flexcan: add quirk FLEXCAN_QUIRK_ENABLE_EACEN_RRS")
>   b3cf53e988ce ("can: flexcan: add support for timestamp based rx-offload")
> 
> from the net-next tree and commit:
> 
>   "scripts/spelling.txt: add "disble(d)" pattern and fix typo instances"
> 
> from the akpm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 

> diff --cc drivers/net/can/flexcan.c
> index ea57fed375c6,4dc71bce525c..000000000000
> --- a/drivers/net/can/flexcan.c
> +++ b/drivers/net/can/flexcan.c
> @@@ -195,9 -189,7 +195,9 @@@
>    */
>   #define FLEXCAN_QUIRK_BROKEN_ERR_STATE	BIT(1) /* [TR]WRN_INT not connected */
>   #define FLEXCAN_QUIRK_DISABLE_RXFG	BIT(2) /* Disable RX FIFO Global mask */
>  -#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(3) /* Disable Memory error detection */
>  +#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS	BIT(3) /* Enable EACEN and RRS bit in ctrl2 */
> - #define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disble Memory error detection */
> ++#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disbale Memory error detection */

                                                  ^^^^^^^
Should be "Disable". I'll send David Miller a fix for the typo.

>  +#define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP	BIT(5) /* Use timestamp based offloading */
>   
>   /* Structure of the message buffer */
>   struct flexcan_mb {

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

  drivers/net/can/flexcan.c

between commits:

  9eb7aa891101 ("can: flexcan: add quirk FLEXCAN_QUIRK_ENABLE_EACEN_RRS")
  b3cf53e988ce ("can: flexcan: add support for timestamp based rx-offload")

from the net-next tree and commit:

  "scripts/spelling.txt: add "disble(d)" pattern and fix typo instances"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/can/flexcan.c
index ea57fed375c6,4dc71bce525c..000000000000
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -195,9 -189,7 +195,9 @@@
   */
  #define FLEXCAN_QUIRK_BROKEN_ERR_STATE	BIT(1) /* [TR]WRN_INT not connected */
  #define FLEXCAN_QUIRK_DISABLE_RXFG	BIT(2) /* Disable RX FIFO Global mask */
 -#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(3) /* Disable Memory error detection */
 +#define FLEXCAN_QUIRK_ENABLE_EACEN_RRS	BIT(3) /* Enable EACEN and RRS bit in ctrl2 */
- #define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disble Memory error detection */
++#define FLEXCAN_QUIRK_DISABLE_MECR	BIT(4) /* Disbale Memory error detection */
 +#define FLEXCAN_QUIRK_USE_OFF_TIMESTAMP	BIT(5) /* Use timestamp based offloading */
  
  /* Structure of the message buffer */
  struct flexcan_mb {

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/bridge/br_stp.c between commit 42275bd8fcb3 ("switchdev: don't use
anonymous union on switchdev attr/obj structs") from the net-next tree
and commit "net/bridge/br_stp.c: work around gcc-4.4.4 initializer bug"
from the akpm tree.

I fixed it up (the former solves the same problem as the latter but in
a different way, so I just dropped the latter) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 570 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/bridge/br_stp.c between commit 42275bd8fcb3 ("switchdev: don't use
anonymous union on switchdev attr/obj structs") from the net-next tree
and commit "net/bridge/br_stp.c: work around gcc-4.4.4 initializer bug"
from the akpm tree.

I fixed it up (the former solves the same problem as the latter but in
a different way, so I just dropped the latter) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/switchdev/switchdev.c between commit 42275bd8fcb3 ("switchdev:
don't use anonymous union on switchdev attr/obj structs") from the
net-next tree and commit "net/switchdev/switchdev.c: work around
gcc-4.4.4 initializer bug" from the akpm tree.

I fixed it up (the former solves the same problem as the latter but in
a different way, so I just dropped the latter) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/switchdev/switchdev.c between commit 42275bd8fcb3 ("switchdev:
don't use anonymous union on switchdev attr/obj structs") from the
net-next tree and commit "net/switchdev/switchdev.c: work around
gcc-4.4.4 initializer bug" from the akpm tree.

I fixed it up (the former solves the same problem as the latter but in
a different way, so I just dropped the latter) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 535 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/infiniband/hw/cxgb4/device.c between commit da388973d4a1
("iw_cxgb4: fix for 64-bit integer division") from the net-next tree
and commit "drivers/infiniband/hw/cxgb4/device.c: fix 32-bit builds"
from the akpm tree.

I fixed it up (the patches have the same intent, so I just kept the one
in the net-next tree) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 535 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/infiniband/hw/cxgb4/device.c between commit da388973d4a1
("iw_cxgb4: fix for 64-bit integer division") from the net-next tree
and commit "drivers/infiniband/hw/cxgb4/device.c: fix 32-bit builds"
from the akpm tree.

I fixed it up (the patches have the same intent, so I just kept the one
in the net-next tree) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 511 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/netfilter/ipset/ip_set_hash_netportnet.c between commit 1a869205c75c
("netfilter: ipset: The unnamed union initialization may lead to
compilation error") from the net-next tree and commit
"net/netfilter/ipset/ip_set_hash_netportnet.c: fix build with older gccs"
from the akpm tree.

The latter is just a subset of the former, so I dropped the latter.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 511 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/netfilter/ipset/ip_set_hash_netportnet.c between commit 1a869205c75c
("netfilter: ipset: The unnamed union initialization may lead to
compilation error") from the net-next tree and commit
"net/netfilter/ipset/ip_set_hash_netportnet.c: fix build with older gccs"
from the akpm tree.

The latter is just a subset of the former, so I dropped the latter.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 502 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/netfilter/ipset/ip_set_hash_netnet.c between commit 1a869205c75c
("netfilter: ipset: The unnamed union initialization may lead to
compilation error") from the net-next tree and commit
"net/netfilter/ipset/ip_set_hash_netnet.c: fix build with older gcc" from
the akpm tree.

The latter is a subset of the former. so I just dropped the latter.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 502 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/netfilter/ipset/ip_set_hash_netnet.c between commit 1a869205c75c
("netfilter: ipset: The unnamed union initialization may lead to
compilation error") from the net-next tree and commit
"net/netfilter/ipset/ip_set_hash_netnet.c: fix build with older gcc" from
the akpm tree.

The latter is a subset of the former. so I just dropped the latter.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Daniel Borkmann]

On 05/22/2013 09:19 AM, David Miller wrote:
> From: Andrew Morton <akpm@linux-foundation.org>
> Date: Wed, 22 May 2013 00:14:58 -0700
>
>> On Wed, 22 May 2013 00:07:48 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>>
>>> From: Andrew Morton <akpm@linux-foundation.org>
>>> Date: Tue, 21 May 2013 13:04:38 -0700
>>>
>>>> Nicolas, I think the patches need a re-check so I'll drop the versions
>>>> which I presently have.  Please refresh, retest and resend when
>>>> convenient?  It'll need to be against linux-next, which is where the
>>>> conflicting (vfree/module_free) changes have occurred.
>>>
>>> How about working against net-next and submitting your patches to netdev
>>> just like the rest of the world?
>>
>> Well that's probably practical.  But the patchset is a seccomp
>> enhancement for (at present) ARM.  Not exactly net stuff, or anything
>> which netdev readers are likely to spend a lot of time testing and
>> reviewing.
>
> The seccomp BPF bits we reviewed and were interested in completely, because
> we're going to have to support JIT'ing all of that stuff on every cpu and
> we're interested how it fits into the existing BPF codes and infrastructure.

+1

seccomp is wired with BPF (JITs in arch/*/net/ + net/core/filter.c) and that's
part of networking, so they should go through netdev. This makes it also way
easier for review.

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

[David Miller]

From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 22 May 2013 00:14:58 -0700

> On Wed, 22 May 2013 00:07:48 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
> 
>> From: Andrew Morton <akpm@linux-foundation.org>
>> Date: Tue, 21 May 2013 13:04:38 -0700
>> 
>> > Nicolas, I think the patches need a re-check so I'll drop the versions
>> > which I presently have.  Please refresh, retest and resend when
>> > convenient?  It'll need to be against linux-next, which is where the
>> > conflicting (vfree/module_free) changes have occurred.
>> 
>> How about working against net-next and submitting your patches to netdev
>> just like the rest of the world?
>> 
> 
> Well that's probably practical.  But the patchset is a seccomp
> enhancement for (at present) ARM.  Not exactly net stuff, or anything
> which netdev readers are likely to spend a lot of time testing and
> reviewing.

The seccomp BPF bits we reviewed and were interested in completely, because
we're going to have to support JIT'ing all of that stuff on every cpu and
we're interested how it fits into the existing BPF codes and infrastructure.

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

[Andrew Morton]

On Wed, 22 May 2013 00:07:48 -0700 (PDT) David Miller <davem@davemloft.net> wrote:

> From: Andrew Morton <akpm@linux-foundation.org>
> Date: Tue, 21 May 2013 13:04:38 -0700
> 
> > Nicolas, I think the patches need a re-check so I'll drop the versions
> > which I presently have.  Please refresh, retest and resend when
> > convenient?  It'll need to be against linux-next, which is where the
> > conflicting (vfree/module_free) changes have occurred.
> 
> How about working against net-next and submitting your patches to netdev
> just like the rest of the world?
> 

Well that's probably practical.  But the patchset is a seccomp
enhancement for (at present) ARM.  Not exactly net stuff, or anything
which netdev readers are likely to spend a lot of time testing and
reviewing.

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

[David Miller]

From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 21 May 2013 13:04:38 -0700

> Nicolas, I think the patches need a re-check so I'll drop the versions
> which I presently have.  Please refresh, retest and resend when
> convenient?  It'll need to be against linux-next, which is where the
> conflicting (vfree/module_free) changes have occurred.

How about working against net-next and submitting your patches to netdev
just like the rest of the world?

There is zero reason for these changes to go through Andrew's tree.

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

[Andrew Morton]

On Tue, 21 May 2013 14:29:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
> call module_free() from any context") from the net-next tree and commit
> "bpf: add comments explaining the schedule_work() operation" from the
> akpm tree.
> 
> The former means that the latter is no longer required, so I used the
> former and can carry the fix as necessary (no action is required).

Yes, there have been a lot of conflicts in

seccomp-add-generic-code-for-jitted-seccomp-filters.patch
arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter.patch
arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter-fixup-merge-conflict.patch
arm-net-bpf_jit-add-support-for-jitted-seccomp-filters.patch

recently and I'm presently seeing a compilation error.

Nicolas, I think the patches need a re-check so I'll drop the versions
which I presently have.  Please refresh, retest and resend when
convenient?  It'll need to be against linux-next, which is where the
conflicting (vfree/module_free) changes have occurred.

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

[Andrew Morton]

On Tue, 21 May 2013 14:29:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
> call module_free() from any context") from the net-next tree and commit
> "bpf: add comments explaining the schedule_work() operation" from the
> akpm tree.
> 
> The former means that the latter is no longer required, so I used the
> former and can carry the fix as necessary (no action is required).

Yes, there have been a lot of conflicts in

seccomp-add-generic-code-for-jitted-seccomp-filters.patch
arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter.patch
arm-net-bpf_jit-make-code-generation-less-dependent-on-struct-sk_filter-fixup-merge-conflict.patch
arm-net-bpf_jit-add-support-for-jitted-seccomp-filters.patch

recently and I'm presently seeing a compilation error.

Nicolas, I think the patches need a re-check so I'll drop the versions
which I presently have.  Please refresh, retest and resend when
convenient?  It'll need to be against linux-next, which is where the
conflicting (vfree/module_free) changes have occurred.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/powerpc/net/bpf_jit_comp.c between commit ed900ffb73e3 ("ppc:
bpf_jit: can call module_free() from any context") from the net-next tree
and commit "bpf: add comments explaining the schedule_work() operation"
from the akpm tree.

The former means that the latter is no longer required, so I used the
former and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/powerpc/net/bpf_jit_comp.c between commit ed900ffb73e3 ("ppc:
bpf_jit: can call module_free() from any context") from the net-next tree
and commit "bpf: add comments explaining the schedule_work() operation"
from the akpm tree.

The former means that the latter is no longer required, so I used the
former and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
call module_free() from any context") from the net-next tree and commit
"bpf: add comments explaining the schedule_work() operation" from the
akpm tree.

The former means that the latter is no longer required, so I used the
former and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/arm/net/bpf_jit_32.c between commit aafc787e41fd ("arm: bpf_jit: can
call module_free() from any context") from the net-next tree and commit
"bpf: add comments explaining the schedule_work() operation" from the
akpm tree.

The former means that the latter is no longer required, so I used the
former and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/x86/net/bpf_jit_comp.c between commit 650c8496702f ("x86:
bpf_jit_comp: can call module_free() from any context") from the net-next
tree and commit "bpf: add comments explaining the schedule_work()
operation" from the akpm tree.

The former means that the latter is no longer needed, so I used the
former and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/x86/net/bpf_jit_comp.c between commit 650c8496702f ("x86:
bpf_jit_comp: can call module_free() from any context") from the net-next
tree and commit "bpf: add comments explaining the schedule_work()
operation" from the akpm tree.

The former means that the latter is no longer needed, so I used the
former and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/sparc/net/bpf_jit_comp.c between commit 5199dfe531db ("sparc:
bpf_jit_comp: can call module_free() from any context") from the net-next
tree and commit "bpf: add comments explaining the schedule_work()
operation" from the akpm tree.

The former means that the latter is no longer reqired, so I used the
former and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/sparc/net/bpf_jit_comp.c between commit 5199dfe531db ("sparc:
bpf_jit_comp: can call module_free() from any context") from the net-next
tree and commit "bpf: add comments explaining the schedule_work()
operation" from the akpm tree.

The former means that the latter is no longer reqired, so I used the
former and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Cong Wang]

On 02/20/2013 02:02 PM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> net/core/dev.c between commit 900ff8c63214 ("net: move procfs code to
> net/core/net-procfs.c") from the net-next tree and commit "hlist: drop
> the node parameter from iterators" from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>

Looks good.

Thanks, Stephen!

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/core/dev.c between commit 900ff8c63214 ("net: move procfs code to
net/core/net-procfs.c") from the net-next tree and commit "hlist: drop
the node parameter from iterators" from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index 0f6bb6f..3174f19 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -16,12 +16,11 @@ static inline struct net_device *dev_from_same_bucket(struct seq_file *seq, loff
 {
 	struct net *net = seq_file_net(seq);
 	struct net_device *dev;
-	struct hlist_node *p;
 	struct hlist_head *h;
 	unsigned int count = 0, offset = get_offset(*pos);
 
 	h = &net->dev_name_head[get_bucket(*pos)];
-	hlist_for_each_entry_rcu(dev, p, h, name_hlist) {
+	hlist_for_each_entry_rcu(dev, h, name_hlist) {
 		if (++count == offset)
 			return dev;
 	}

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/core/dev.c between commit 900ff8c63214 ("net: move procfs code to
net/core/net-procfs.c") from the net-next tree and commit "hlist: drop
the node parameter from iterators" from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index 0f6bb6f..3174f19 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -16,12 +16,11 @@ static inline struct net_device *dev_from_same_bucket(struct seq_file *seq, loff
 {
 	struct net *net = seq_file_net(seq);
 	struct net_device *dev;
-	struct hlist_node *p;
 	struct hlist_head *h;
 	unsigned int count = 0, offset = get_offset(*pos);
 
 	h = &net->dev_name_head[get_bucket(*pos)];
-	hlist_for_each_entry_rcu(dev, p, h, name_hlist) {
+	hlist_for_each_entry_rcu(dev, h, name_hlist) {
 		if (++count == offset)
 			return dev;
 	}

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2462 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/bridge/br_fdb.c between commit 2ba071ecb6d4 ("bridge: Add vlan to
unicast fdb entries") from the net-next tree and commit "hlist: drop the
node parameter from iterators" from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/bridge/br_fdb.c
index 8117900,4fb0461..0000000
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@@ -263,16 -231,12 +263,15 @@@ void br_fdb_delete_by_port(struct net_b
  
  /* No locking or refcounting, assumes caller has rcu_read_lock */
  struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
 -					  const unsigned char *addr)
 +					  const unsigned char *addr,
 +					  __u16 vid)
  {
- 	struct hlist_node *h;
  	struct net_bridge_fdb_entry *fdb;
  
- 	hlist_for_each_entry_rcu(fdb, h,
 -	hlist_for_each_entry_rcu(fdb, &br->hash[br_mac_hash(addr)], hlist) {
 -		if (ether_addr_equal(fdb->addr.addr, addr)) {
++	hlist_for_each_entry_rcu(fdb,
 +				&br->hash[br_mac_hash(addr, vid)], hlist) {
 +		if (ether_addr_equal(fdb->addr.addr, addr) &&
 +		    fdb->vlan_id == vid) {
  			if (unlikely(has_expired(br, fdb)))
  				break;
  			return fdb;
@@@ -360,30 -323,24 +358,28 @@@ int br_fdb_fillbuf(struct net_bridge *b
  }
  
  static struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head,
 -					     const unsigned char *addr)
 +					     const unsigned char *addr,
 +					     __u16 vid)
  {
- 	struct hlist_node *h;
  	struct net_bridge_fdb_entry *fdb;
  
- 	hlist_for_each_entry(fdb, h, head, hlist) {
+ 	hlist_for_each_entry(fdb, head, hlist) {
 -		if (ether_addr_equal(fdb->addr.addr, addr))
 +		if (ether_addr_equal(fdb->addr.addr, addr) &&
 +		    fdb->vlan_id == vid)
  			return fdb;
  	}
  	return NULL;
  }
  
  static struct net_bridge_fdb_entry *fdb_find_rcu(struct hlist_head *head,
 -						 const unsigned char *addr)
 +						 const unsigned char *addr,
 +						 __u16 vid)
  {
- 	struct hlist_node *h;
  	struct net_bridge_fdb_entry *fdb;
  
- 	hlist_for_each_entry_rcu(fdb, h, head, hlist) {
+ 	hlist_for_each_entry_rcu(fdb, head, hlist) {
 -		if (ether_addr_equal(fdb->addr.addr, addr))
 +		if (ether_addr_equal(fdb->addr.addr, addr) &&
 +		    fdb->vlan_id == vid)
  			return fdb;
  	}
  	return NULL;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2462 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
net/bridge/br_fdb.c between commit 2ba071ecb6d4 ("bridge: Add vlan to
unicast fdb entries") from the net-next tree and commit "hlist: drop the
node parameter from iterators" from the akpm tree.

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/bridge/br_fdb.c
index 8117900,4fb0461..0000000
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@@ -263,16 -231,12 +263,15 @@@ void br_fdb_delete_by_port(struct net_b
  
  /* No locking or refcounting, assumes caller has rcu_read_lock */
  struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
 -					  const unsigned char *addr)
 +					  const unsigned char *addr,
 +					  __u16 vid)
  {
- 	struct hlist_node *h;
  	struct net_bridge_fdb_entry *fdb;
  
- 	hlist_for_each_entry_rcu(fdb, h,
 -	hlist_for_each_entry_rcu(fdb, &br->hash[br_mac_hash(addr)], hlist) {
 -		if (ether_addr_equal(fdb->addr.addr, addr)) {
++	hlist_for_each_entry_rcu(fdb,
 +				&br->hash[br_mac_hash(addr, vid)], hlist) {
 +		if (ether_addr_equal(fdb->addr.addr, addr) &&
 +		    fdb->vlan_id == vid) {
  			if (unlikely(has_expired(br, fdb)))
  				break;
  			return fdb;
@@@ -360,30 -323,24 +358,28 @@@ int br_fdb_fillbuf(struct net_bridge *b
  }
  
  static struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head,
 -					     const unsigned char *addr)
 +					     const unsigned char *addr,
 +					     __u16 vid)
  {
- 	struct hlist_node *h;
  	struct net_bridge_fdb_entry *fdb;
  
- 	hlist_for_each_entry(fdb, h, head, hlist) {
+ 	hlist_for_each_entry(fdb, head, hlist) {
 -		if (ether_addr_equal(fdb->addr.addr, addr))
 +		if (ether_addr_equal(fdb->addr.addr, addr) &&
 +		    fdb->vlan_id == vid)
  			return fdb;
  	}
  	return NULL;
  }
  
  static struct net_bridge_fdb_entry *fdb_find_rcu(struct hlist_head *head,
 -						 const unsigned char *addr)
 +						 const unsigned char *addr,
 +						 __u16 vid)
  {
- 	struct hlist_node *h;
  	struct net_bridge_fdb_entry *fdb;
  
- 	hlist_for_each_entry_rcu(fdb, h, head, hlist) {
+ 	hlist_for_each_entry_rcu(fdb, head, hlist) {
 -		if (ether_addr_equal(fdb->addr.addr, addr))
 +		if (ether_addr_equal(fdb->addr.addr, addr) &&
 +		    fdb->vlan_id == vid)
  			return fdb;
  	}
  	return NULL;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/net/can/c_can/c_can_platform.c between commit 33f810097769 ("can:
c_can: Move overlay structure to array with offset as index") from the
net-next tree and commit "net/c_can: remove conditional compilation of
clk code" from the akpm tree.

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

diff --cc drivers/net/can/c_can/c_can_platform.c
index f0921d1,7ec9316..0000000
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@@ -71,10 -71,8 +71,9 @@@ static int __devinit c_can_plat_probe(s
  	void __iomem *addr;
  	struct net_device *dev;
  	struct c_can_priv *priv;
 +	const struct platform_device_id *id;
  	struct resource *mem;
  	int irq;
- #ifdef CONFIG_HAVE_CLK
  	struct clk *clk;
  
  	/* get the appropriate clk */
@@@ -138,18 -129,8 +136,16 @@@
  		priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
  		priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
  		break;
 +	default:
 +		ret = -EINVAL;
 +		goto exit_free_device;
  	}
  
 +	dev->irq = irq;
 +	priv->base = addr;
- #ifdef CONFIG_HAVE_CLK
 +	priv->can.clock.freq = clk_get_rate(clk);
 +	priv->priv = clk;
- #endif
 +
  	platform_set_drvdata(pdev, dev);
  	SET_NETDEV_DEV(dev, &pdev->dev);
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/net/can/c_can/c_can_platform.c between commit 33f810097769 ("can:
c_can: Move overlay structure to array with offset as index") from the
net-next tree and commit "net/c_can: remove conditional compilation of
clk code" from the akpm tree.

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

diff --cc drivers/net/can/c_can/c_can_platform.c
index f0921d1,7ec9316..0000000
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@@ -71,10 -71,8 +71,9 @@@ static int __devinit c_can_plat_probe(s
  	void __iomem *addr;
  	struct net_device *dev;
  	struct c_can_priv *priv;
 +	const struct platform_device_id *id;
  	struct resource *mem;
  	int irq;
- #ifdef CONFIG_HAVE_CLK
  	struct clk *clk;
  
  	/* get the appropriate clk */
@@@ -138,18 -129,8 +136,16 @@@
  		priv->read_reg = c_can_plat_read_reg_aligned_to_16bit;
  		priv->write_reg = c_can_plat_write_reg_aligned_to_16bit;
  		break;
 +	default:
 +		ret = -EINVAL;
 +		goto exit_free_device;
  	}
  
 +	dev->irq = irq;
 +	priv->base = addr;
- #ifdef CONFIG_HAVE_CLK
 +	priv->can.clock.freq = clk_get_rate(clk);
 +	priv->priv = clk;
- #endif
 +
  	platform_set_drvdata(pdev, dev);
  	SET_NETDEV_DEV(dev, &pdev->dev);
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Neil Horman]

On Wed, Nov 23, 2011 at 02:27:42PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm got a conflict in
> include/linux/cgroup_subsys.h between commit 5bc1421e34ec ("net: add
> network priority cgroup infrastructure (v4)") from the net-next tree and
> commit 22a20a26f21c ("cgroups: add a task counter subsystem") from the
> akpm tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.
ACK, thanks Stephen.
Neil

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 827 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm got a conflict in
include/linux/cgroup_subsys.h between commit 5bc1421e34ec ("net: add
network priority cgroup infrastructure (v4)") from the net-next tree and
commit 22a20a26f21c ("cgroups: add a task counter subsystem") from the
akpm tree.

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

diff --cc include/linux/cgroup_subsys.h
index 0bd390c,5425822..0000000
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@@ -67,8 -67,8 +67,14 @@@ SUBSYS(perf
  
  /* */
  
 +#ifdef CONFIG_NETPRIO_CGROUP
 +SUBSYS(net_prio)
 +#endif
 +
 +/* */
++
+ #ifdef CONFIG_CGROUP_TASK_COUNTER
+ SUBSYS(tasks)
+ #endif
+ 
+ /* */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 827 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm got a conflict in
include/linux/cgroup_subsys.h between commit 5bc1421e34ec ("net: add
network priority cgroup infrastructure (v4)") from the net-next tree and
commit 22a20a26f21c ("cgroups: add a task counter subsystem") from the
akpm tree.

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

diff --cc include/linux/cgroup_subsys.h
index 0bd390c,5425822..0000000
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@@ -67,8 -67,8 +67,14 @@@ SUBSYS(perf
  
  /* */
  
 +#ifdef CONFIG_NETPRIO_CGROUP
 +SUBSYS(net_prio)
 +#endif
 +
 +/* */
++
+ #ifdef CONFIG_CGROUP_TASK_COUNTER
+ SUBSYS(tasks)
+ #endif
+ 
+ /* */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]