netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tom Parkin <tparkin@katalix.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, jchapman@katalix.com, celston@katalix.com
Subject: Re: [PATCH 0/4] l2tp: fix namespace support in l2tp_core
Date: Tue, 5 Feb 2013 09:27:09 +0000	[thread overview]
Message-ID: <20130205092709.GA2465@raven> (raw)
In-Reply-To: <20130204.132107.47370979625013842.davem@davemloft.net>

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

On Mon, Feb 04, 2013 at 01:21:07PM -0500, David Miller wrote:
> 
> These patches don't apply cleanly to net-next, please respin.

Hmm.  I think the problem is that this patchset builds on the bug-fix
work of this previous submission:

  * l2tp: prevent l2tp_tunnel_delete racing with userspace close

The bug fix patch went to the net tree, not net-next, hence the
problem.  I should have made the dependency between the two patches
more explicit -- apologies for not having done so!

What's the right thing for me to do in a situation like this?  Should
I wait and resubmit when net-next and net are next synchronised?

Thanks,
Tom
-- 
Tom Parkin
Katalix Systems Ltd
http://www.katalix.com
Catalysts for your Embedded Linux software development

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

  reply	other threads:[~2013-02-05  9:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-01  9:42 [PATCH 0/4] l2tp: fix namespace support in l2tp_core Tom Parkin
2013-02-01  9:43 ` [PATCH 1/4] l2tp: put tunnel socket release on a workqueue Tom Parkin
2013-02-01  9:43 ` [PATCH 2/4] l2tp: set netnsok flag for netlink messages Tom Parkin
2013-02-01  9:43 ` [PATCH 3/4] l2tp: prevent tunnel creation on netns mismatch Tom Parkin
2013-02-01  9:43 ` [PATCH 4/4] l2tp: create tunnel sockets in the right namespace Tom Parkin
2013-02-04 18:21 ` [PATCH 0/4] l2tp: fix namespace support in l2tp_core David Miller
2013-02-05  9:27   ` Tom Parkin [this message]
2013-02-05 18:56     ` David Miller

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=20130205092709.GA2465@raven \
    --to=tparkin@katalix.com \
    --cc=celston@katalix.com \
    --cc=davem@davemloft.net \
    --cc=jchapman@katalix.com \
    --cc=netdev@vger.kernel.org \
    /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).