linux-next: manual merge of the trivial tree

linux-next: manual merge of the trivial tree

[Stephen Rothwell]

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

Hi Jesper,

Given that you have had to give up producing the trivial tree and that it
has conflicts against Linus' tree, I will remove it permanently from
linux-next.

Thanks for your work over time.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the trivial tree

[Jesper Juhl]

2008/11/3 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Jesper,
>
> Given that you have had to give up producing the trivial tree and that it
> has conflicts against Linus' tree, I will remove it permanently from
> linux-next.
>
Good plan - at least until someone else takes over.

> Thanks for your work over time.

You're welcome.

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>



-- 
Jesper Juhl <jesper.juhl@gmail.com>
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please      http://www.expita.com/nomime.html

Re: linux-next: manual merge of the trivial tree

[Jozsef Kadlecsik]

On Wed, 16 Oct 2013, Pablo Neira Ayuso wrote:

> On Wed, Oct 16, 2013 at 11:20:04AM +0200, Jiri Kosina wrote:
> > On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote:
> > 
> > > > Today's linux-next merge of the trivial tree got conflicts in
> > > > 
> > > > 	net/netfilter/xt_set.c
> > > > 
> > > > caused by commits 3f79410 (treewide: Fix common typo in "identify") and
> > > > bd3129f (netfilter: ipset: order matches and targets separatedly in
> > > > xt_set.c).
> > > > 
> > > > I fixed them up (see below). Please verify that the resolution looks
> > > > good.
> > > 
> > > I don't really get it: patch bd3129f was part of a patchset, which was 
> > > applied to net-next and there it was complete.
> > > 
> > > There's none of the patchset in question in linux-next, so what's the 
> > > trivial tree? Where's lost what?
> 
> To Jozsef: David collects all the networking patches in net-next until
> Linus' merge window opens, that's why you don't see your patches in
> linux-next. It seems Jiri merges this trivial tree (which indeed
> contains your net-next patches already) to linux-next.
> 
> > > [The patch below doesn't look good, because it should contain the removed 
> > > part for the revision 1 match due to the reordering in the file.]
> > 
> > This is just a super-simple conflict between
> > 
> > 	https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/?id=bd3129f
> > 
> > and
> > 
> > 	https://git.kernel.org/cgit/linux/kernel/git/jikos/trivial.git/diff/net/netfilter/xt_set.c?h=for-next&id=3f79410c7c
> > 
> > I don't think it needs any special handling, do you? I can of course drop 
> > the respective hunk from my tree and let you handle it in net-next if you 
> > wish.
> 
> Please, don't drop it, I think Jozsef got confused by the handling of
> your trivial tree.
 
I was confused mainly because Thierry sent just the relevant part and I 
expected a full patch :-). So it's just fine.

Best regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary

Re: linux-next: manual merge of the trivial tree

[Pablo Neira Ayuso]

On Wed, Oct 16, 2013 at 11:20:04AM +0200, Jiri Kosina wrote:
> On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote:
> 
> > > Today's linux-next merge of the trivial tree got conflicts in
> > > 
> > > 	net/netfilter/xt_set.c
> > > 
> > > caused by commits 3f79410 (treewide: Fix common typo in "identify") and
> > > bd3129f (netfilter: ipset: order matches and targets separatedly in
> > > xt_set.c).
> > > 
> > > I fixed them up (see below). Please verify that the resolution looks
> > > good.
> > 
> > I don't really get it: patch bd3129f was part of a patchset, which was 
> > applied to net-next and there it was complete.
> > 
> > There's none of the patchset in question in linux-next, so what's the 
> > trivial tree? Where's lost what?

To Jozsef: David collects all the networking patches in net-next until
Linus' merge window opens, that's why you don't see your patches in
linux-next. It seems Jiri merges this trivial tree (which indeed
contains your net-next patches already) to linux-next.

> > [The patch below doesn't look good, because it should contain the removed 
> > part for the revision 1 match due to the reordering in the file.]
> 
> This is just a super-simple conflict between
> 
> 	https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/?id=bd3129f
> 
> and
> 
> 	https://git.kernel.org/cgit/linux/kernel/git/jikos/trivial.git/diff/net/netfilter/xt_set.c?h=for-next&id=3f79410c7c
> 
> I don't think it needs any special handling, do you? I can of course drop 
> the respective hunk from my tree and let you handle it in net-next if you 
> wish.

Please, don't drop it, I think Jozsef got confused by the handling of
your trivial tree.

Re: linux-next: manual merge of the trivial tree

[Jiri Kosina]

On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote:

> > Today's linux-next merge of the trivial tree got conflicts in
> > 
> > 	net/netfilter/xt_set.c
> > 
> > caused by commits 3f79410 (treewide: Fix common typo in "identify") and
> > bd3129f (netfilter: ipset: order matches and targets separatedly in
> > xt_set.c).
> > 
> > I fixed them up (see below). Please verify that the resolution looks
> > good.
> 
> I don't really get it: patch bd3129f was part of a patchset, which was 
> applied to net-next and there it was complete.
> 
> There's none of the patchset in question in linux-next, so what's the 
> trivial tree? Where's lost what?
> 
> [The patch below doesn't look good, because it should contain the removed 
> part for the revision 1 match due to the reordering in the file.]

This is just a super-simple conflict between

	https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/?id=bd3129f

and

	https://git.kernel.org/cgit/linux/kernel/git/jikos/trivial.git/diff/net/netfilter/xt_set.c?h=for-next&id=3f79410c7c

I don't think it needs any special handling, do you? I can of course drop 
the respective hunk from my tree and let you handle it in net-next if you 
wish.

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: linux-next: manual merge of the trivial tree

[Jozsef Kadlecsik]

On Tue, 15 Oct 2013, Thierry Reding wrote:

> Today's linux-next merge of the trivial tree got conflicts in
> 
> 	net/netfilter/xt_set.c
> 
> caused by commits 3f79410 (treewide: Fix common typo in "identify") and
> bd3129f (netfilter: ipset: order matches and targets separatedly in
> xt_set.c).
> 
> I fixed them up (see below). Please verify that the resolution looks
> good.

I don't really get it: patch bd3129f was part of a patchset, which was 
applied to net-next and there it was complete.

There's none of the patchset in question in linux-next, so what's the 
trivial tree? Where's lost what?

[The patch below doesn't look good, because it should contain the removed 
part for the revision 1 match due to the reordering in the file.]

Best regards,
Jozsef

> ---
> diff --cc net/netfilter/xt_set.c
> index e7c4e0e,4b9d6b4..80c2e2d
> --- a/net/netfilter/xt_set.c
> +++ b/net/netfilter/xt_set.c
> @@@ -81,10 -81,10 +81,10 @@@ set_match_v0_checkentry(const struct xt
>   	struct xt_set_info_match_v0 *info = par->matchinfo;
>   	ip_set_id_t index;
>   
>  -	index = ip_set_nfnl_get_byindex(info->match_set.index);
>  +	index = ip_set_nfnl_get_byindex(par->net, info->match_set.index);
>   
>   	if (index == IPSET_INVALID_ID) {
> - 		pr_warning("Cannot find set indentified by id %u to match\n",
> + 		pr_warning("Cannot find set identified by id %u to match\n",
>   			   info->match_set.index);
>   		return -ENOENT;
>   	}
> @@@ -106,104 -106,9 +106,104 @@@ set_match_v0_destroy(const struct xt_mt
>   {
>   	struct xt_set_info_match_v0 *info = par->matchinfo;
>   
>  -	ip_set_nfnl_put(info->match_set.index);
>  +	ip_set_nfnl_put(par->net, info->match_set.index);
>   }
>   
>  +/* Revision 1 match */
>  +
>  +static bool
>  +set_match_v1(const struct sk_buff *skb, struct xt_action_param *par)
>  +{
>  +	const struct xt_set_info_match_v1 *info = par->matchinfo;
>  +	ADT_OPT(opt, par->family, info->match_set.dim,
>  +		info->match_set.flags, 0, UINT_MAX);
>  +
>  +	if (opt.flags & IPSET_RETURN_NOMATCH)
>  +		opt.cmdflags |= IPSET_FLAG_RETURN_NOMATCH;
>  +
>  +	return match_set(info->match_set.index, skb, par, &opt,
>  +			 info->match_set.flags & IPSET_INV_MATCH);
>  +}
>  +
>  +static int
>  +set_match_v1_checkentry(const struct xt_mtchk_param *par)
>  +{
>  +	struct xt_set_info_match_v1 *info = par->matchinfo;
>  +	ip_set_id_t index;
>  +
>  +	index = ip_set_nfnl_get_byindex(par->net, info->match_set.index);
>  +
>  +	if (index == IPSET_INVALID_ID) {
> - 		pr_warning("Cannot find set indentified by id %u to match\n",
> ++		pr_warning("Cannot find set identified by id %u to match\n",
>  +			   info->match_set.index);
>  +		return -ENOENT;
>  +	}
>  +	if (info->match_set.dim > IPSET_DIM_MAX) {
>  +		pr_warning("Protocol error: set match dimension "
>  +			   "is over the limit!\n");
>  +		ip_set_nfnl_put(par->net, info->match_set.index);
>  +		return -ERANGE;
>  +	}
>  +
>  +	return 0;
>  +}
>  +
>  +static void
>  +set_match_v1_destroy(const struct xt_mtdtor_param *par)
>  +{
>  +	struct xt_set_info_match_v1 *info = par->matchinfo;
>  +
>  +	ip_set_nfnl_put(par->net, info->match_set.index);
>  +}
>  +
>  +/* Revision 3 match */
>  +
>  +static bool
>  +match_counter(u64 counter, const struct ip_set_counter_match *info)
>  +{
>  +	switch (info->op) {
>  +	case IPSET_COUNTER_NONE:
>  +		return true;
>  +	case IPSET_COUNTER_EQ:
>  +		return counter == info->value;
>  +	case IPSET_COUNTER_NE:
>  +		return counter != info->value;
>  +	case IPSET_COUNTER_LT:
>  +		return counter < info->value;
>  +	case IPSET_COUNTER_GT:
>  +		return counter > info->value;
>  +	}
>  +	return false;
>  +}
>  +
>  +static bool
>  +set_match_v3(const struct sk_buff *skb, struct xt_action_param *par)
>  +{
>  +	const struct xt_set_info_match_v3 *info = par->matchinfo;
>  +	ADT_OPT(opt, par->family, info->match_set.dim,
>  +		info->match_set.flags, info->flags, UINT_MAX);
>  +	int ret;
>  +
>  +	if (info->packets.op != IPSET_COUNTER_NONE ||
>  +	    info->bytes.op != IPSET_COUNTER_NONE)
>  +		opt.cmdflags |= IPSET_FLAG_MATCH_COUNTERS;
>  +
>  +	ret = match_set(info->match_set.index, skb, par, &opt,
>  +			info->match_set.flags & IPSET_INV_MATCH);
>  +
>  +	if (!(ret && opt.cmdflags & IPSET_FLAG_MATCH_COUNTERS))
>  +		return ret;
>  +
>  +	if (!match_counter(opt.ext.packets, &info->packets))
>  +		return 0;
>  +	return match_counter(opt.ext.bytes, &info->bytes);
>  +}
>  +
>  +#define set_match_v3_checkentry	set_match_v1_checkentry
>  +#define set_match_v3_destroy	set_match_v1_destroy
>  +
>  +/* Revision 0 interface: backward compatible with netfilter/iptables */
>  +
>   static unsigned int
>   set_target_v0(struct sk_buff *skb, const struct xt_action_param *par)
>   {
> 

-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary

linux-next: manual merge of the trivial tree

[Thierry Reding]

Today's linux-next merge of the trivial tree got conflicts in

	net/netfilter/xt_set.c

caused by commits 3f79410 (treewide: Fix common typo in "identify") and
bd3129f (netfilter: ipset: order matches and targets separatedly in
xt_set.c).

I fixed them up (see below). Please verify that the resolution looks
good.

Thanks,
Thierry
---
diff --cc net/netfilter/xt_set.c
index e7c4e0e,4b9d6b4..80c2e2d
--- a/net/netfilter/xt_set.c
+++ b/net/netfilter/xt_set.c
@@@ -81,10 -81,10 +81,10 @@@ set_match_v0_checkentry(const struct xt
  	struct xt_set_info_match_v0 *info = par->matchinfo;
  	ip_set_id_t index;
  
 -	index = ip_set_nfnl_get_byindex(info->match_set.index);
 +	index = ip_set_nfnl_get_byindex(par->net, info->match_set.index);
  
  	if (index == IPSET_INVALID_ID) {
- 		pr_warning("Cannot find set indentified by id %u to match\n",
+ 		pr_warning("Cannot find set identified by id %u to match\n",
  			   info->match_set.index);
  		return -ENOENT;
  	}
@@@ -106,104 -106,9 +106,104 @@@ set_match_v0_destroy(const struct xt_mt
  {
  	struct xt_set_info_match_v0 *info = par->matchinfo;
  
 -	ip_set_nfnl_put(info->match_set.index);
 +	ip_set_nfnl_put(par->net, info->match_set.index);
  }
  
 +/* Revision 1 match */
 +
 +static bool
 +set_match_v1(const struct sk_buff *skb, struct xt_action_param *par)
 +{
 +	const struct xt_set_info_match_v1 *info = par->matchinfo;
 +	ADT_OPT(opt, par->family, info->match_set.dim,
 +		info->match_set.flags, 0, UINT_MAX);
 +
 +	if (opt.flags & IPSET_RETURN_NOMATCH)
 +		opt.cmdflags |= IPSET_FLAG_RETURN_NOMATCH;
 +
 +	return match_set(info->match_set.index, skb, par, &opt,
 +			 info->match_set.flags & IPSET_INV_MATCH);
 +}
 +
 +static int
 +set_match_v1_checkentry(const struct xt_mtchk_param *par)
 +{
 +	struct xt_set_info_match_v1 *info = par->matchinfo;
 +	ip_set_id_t index;
 +
 +	index = ip_set_nfnl_get_byindex(par->net, info->match_set.index);
 +
 +	if (index == IPSET_INVALID_ID) {
- 		pr_warning("Cannot find set indentified by id %u to match\n",
++		pr_warning("Cannot find set identified by id %u to match\n",
 +			   info->match_set.index);
 +		return -ENOENT;
 +	}
 +	if (info->match_set.dim > IPSET_DIM_MAX) {
 +		pr_warning("Protocol error: set match dimension "
 +			   "is over the limit!\n");
 +		ip_set_nfnl_put(par->net, info->match_set.index);
 +		return -ERANGE;
 +	}
 +
 +	return 0;
 +}
 +
 +static void
 +set_match_v1_destroy(const struct xt_mtdtor_param *par)
 +{
 +	struct xt_set_info_match_v1 *info = par->matchinfo;
 +
 +	ip_set_nfnl_put(par->net, info->match_set.index);
 +}
 +
 +/* Revision 3 match */
 +
 +static bool
 +match_counter(u64 counter, const struct ip_set_counter_match *info)
 +{
 +	switch (info->op) {
 +	case IPSET_COUNTER_NONE:
 +		return true;
 +	case IPSET_COUNTER_EQ:
 +		return counter == info->value;
 +	case IPSET_COUNTER_NE:
 +		return counter != info->value;
 +	case IPSET_COUNTER_LT:
 +		return counter < info->value;
 +	case IPSET_COUNTER_GT:
 +		return counter > info->value;
 +	}
 +	return false;
 +}
 +
 +static bool
 +set_match_v3(const struct sk_buff *skb, struct xt_action_param *par)
 +{
 +	const struct xt_set_info_match_v3 *info = par->matchinfo;
 +	ADT_OPT(opt, par->family, info->match_set.dim,
 +		info->match_set.flags, info->flags, UINT_MAX);
 +	int ret;
 +
 +	if (info->packets.op != IPSET_COUNTER_NONE ||
 +	    info->bytes.op != IPSET_COUNTER_NONE)
 +		opt.cmdflags |= IPSET_FLAG_MATCH_COUNTERS;
 +
 +	ret = match_set(info->match_set.index, skb, par, &opt,
 +			info->match_set.flags & IPSET_INV_MATCH);
 +
 +	if (!(ret && opt.cmdflags & IPSET_FLAG_MATCH_COUNTERS))
 +		return ret;
 +
 +	if (!match_counter(opt.ext.packets, &info->packets))
 +		return 0;
 +	return match_counter(opt.ext.bytes, &info->bytes);
 +}
 +
 +#define set_match_v3_checkentry	set_match_v1_checkentry
 +#define set_match_v3_destroy	set_match_v1_destroy
 +
 +/* Revision 0 interface: backward compatible with netfilter/iptables */
 +
  static unsigned int
  set_target_v0(struct sk_buff *skb, const struct xt_action_param *par)
  {

Re: linux-next: manual merge of the trivial tree

[Stephen Rothwell]

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

Hi Nick, Jesper,

On Mon, 28 Jul 2008 19:41:10 +1000 Nick Andrew <nick@nick-andrew.net> wrote:
>
> On Mon, Jul 28, 2008 at 01:37:07PM +1000, Stephen Rothwell wrote:
> > Today's linux-next merge of the trivial tree got a conflict in
> > Documentation/edac.txt between commit
> > 327dafb1c61c9da7b95ac6cc7634a2340cc9509c ("edac: core fix redundant sysfs
> > controls to parameters") from Linus' tree and commit
> > 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
> > from the trivial tree.
> 
> Should we drop the patch or alternately split it into one patch
> per affected file? This must be at least the 3rd time this patch
> has conflicted with other changes.

Can you send all of the trivial tree (that is in -next) to Linus (asking
nicely if he will take it), please?  Doing that will require rebasing at
least the above patch (or merging Linus' tree (at least up to the commit
above)) and fixing the conflicts.  It has been in its current state since
May 20 ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the trivial tree

[Nick Andrew]

Hi all,

On Mon, Jul 28, 2008 at 01:37:07PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> Documentation/edac.txt between commit
> 327dafb1c61c9da7b95ac6cc7634a2340cc9509c ("edac: core fix redundant sysfs
> controls to parameters") from Linus' tree and commit
> 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
> from the trivial tree.

Should we drop the patch or alternately split it into one patch
per affected file? This must be at least the 3rd time this patch
has conflicted with other changes.

Nick.
-- 
PGP Key ID = 0x418487E7                      http://www.nick-andrew.net/
PGP Key fingerprint = B3ED 6894 8E49 1770 C24A  67E3 6266 6EB9 4184 87E7

linux-next: manual merge of the trivial tree

[Stephen Rothwell]

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

Hi Jesper,

Today's linux-next merge of the trivial tree got a conflict in
Documentation/edac.txt between commit
327dafb1c61c9da7b95ac6cc7634a2340cc9509c ("edac: core fix redundant sysfs
controls to parameters") from Linus' tree and commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree.

The former removed the whole section of the file in which the latter had
fixed a spelling mistake.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: manual merge of the trivial tree

[Stephen Rothwell]

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

Hi Jesper,

Today's linux-next merge of the trivial tree got a tivial conflict in
include/linux/securebits.h between commit
086f7316f0d400806d76323beefae996bb3849b1 ("security: filesystem
capabilities: fix fragile setuid fixup code") from Linus' tree and commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree.

This was a trivial conflict (by definition of the tree :-)) the former
commit changed a comment and fixed the instance of loose to lose, so I
used that version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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