linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Kosina <jkosina@suse.cz>
To: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Cc: Thierry Reding <thierry.reding@gmail.com>,
	Pablo Neira Ayuso <pablo@netfilter.org>,
	Patrick McHardy <kaber@trash.net>,
	Maxime Jayat <maxime@artisandeveloppeur.fr>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the trivial tree
Date: Wed, 16 Oct 2013 11:20:04 +0200 (CEST)	[thread overview]
Message-ID: <alpine.LNX.2.00.1310161118070.12405@pobox.suse.cz> (raw)
In-Reply-To: <alpine.DEB.2.10.1310161057190.13374@blackhole.kfki.hu>

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

  reply	other threads:[~2013-10-16  9:20 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-15 14:02 linux-next: Tree for Oct 15 Thierry Reding
2013-10-15 14:02 ` linux-next: manual merge of the trivial tree Thierry Reding
2013-10-16  9:12   ` Jozsef Kadlecsik
2013-10-16  9:20     ` Jiri Kosina [this message]
2013-10-16 14:56       ` Pablo Neira Ayuso
2013-10-16 20:10         ` Jozsef Kadlecsik
2013-10-15 14:02 ` [PATCH] [media] staging: media: Fix build for iMON LIRC driver Thierry Reding
2013-10-16  7:03   ` Dan Carpenter
2013-10-16 14:12     ` Greg Kroah-Hartman
2013-10-15 19:50 ` linux-next: Tree for Oct 15 (usb gadget f_mass_storage and storage_common) Randy Dunlap
2013-10-15 22:43 ` linux-next: Tree for Oct 15 (asymmetric keys) Randy Dunlap
2013-10-16 15:52   ` Thierry Reding
2013-10-19 17:07   ` Randy Dunlap
2013-10-16  5:21 ` linux-next: Tree for Oct 15 Guenter Roeck
2013-10-16 15:50   ` Thierry Reding
2013-10-16 16:37     ` Guenter Roeck
2013-10-16 16:43       ` Thierry Reding
  -- strict thread matches above, loose matches on Subject: below --
2008-11-03  3:48 linux-next: manual merge of the trivial tree Stephen Rothwell
2008-11-12 17:48 ` Jesper Juhl
2008-07-28  3:37 Stephen Rothwell
2008-07-28  9:41 ` Nick Andrew
2008-08-27  5:19   ` Stephen Rothwell
2008-07-07 15:39 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LNX.2.00.1310161118070.12405@pobox.suse.cz \
    --to=jkosina@suse.cz \
    --cc=kaber@trash.net \
    --cc=kadlec@blackhole.kfki.hu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=maxime@artisandeveloppeur.fr \
    --cc=pablo@netfilter.org \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).