public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Alexander Aring <alex.aring@gmail.com>
To: Marcel Holtmann <marcel@holtmann.org>
Cc: Fabian Frederick <fabf@skynet.be>,
	linux-kernel <linux-kernel@vger.kernel.org>,
	"David S. Miller" <davem@davemloft.net>,
	linux-wpan@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH 1/1 net-next] ieee802154: fix __init functions
Date: Wed, 1 Oct 2014 08:08:14 +0200	[thread overview]
Message-ID: <20141001060812.GA23043@omega> (raw)
In-Reply-To: <56FE06A5-5C2A-42E4-B01A-15EB36BAADE5@holtmann.org>

Hi,

On Wed, Oct 01, 2014 at 07:34:39AM +0200, Marcel Holtmann wrote:
> Hi Fabian,
> 
> > Commit 3243acd37fd9
> > ("ieee802154: add __init to lowpan_frags_sysctl_register")
> > 
> > added __init to lowpan_frags_ns_sysctl_register instead of
> > lowpan_frags_sysctl_register
> > 
> > Suggested-by: Alexander Aring <alex.aring@gmail.com>
> > Signed-off-by: Fabian Frederick <fabf@skynet.be>
> > ---
> > net/ieee802154/reassembly.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> when trying to apply this to bluetooth-next kernel, I am getting this:
> 
> Applying: ieee802154: fix __init functions
> error: patch failed: net/ieee802154/reassembly.c:498
> error: net/ieee802154/reassembly.c: patch does not apply
> Patch failed at 0001 ieee802154: fix __init functions
> 

Fabian:
thanks.


Marcel:
this is a patch for a fix which is already in net-next. Please don't
apply, see [0].


Marcel and David:
Now, we have chaos who will apply now patches for ieee802154. I thought
I apply ieee802154 patches to the wpan-next tree and then send it to
bluetooth-next. Please don't change this patchflow.

Okay, I know sometimes people change the inet_frag api, then it should
go into net/net-next.


- Alex

[0] http://marc.info/?l=linux-netdev&m=141213852806003&w=2

  parent reply	other threads:[~2014-10-01  6:08 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-01  5:27 [PATCH 1/1 net-next] ieee802154: fix __init functions Fabian Frederick
2014-10-01  5:34 ` Marcel Holtmann
2014-10-01  6:02   ` David Miller
2014-10-01  6:08   ` Alexander Aring [this message]
2014-10-01  6:03 ` 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=20141001060812.GA23043@omega \
    --to=alex.aring@gmail.com \
    --cc=davem@davemloft.net \
    --cc=fabf@skynet.be \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wpan@vger.kernel.org \
    --cc=marcel@holtmann.org \
    --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