From: Antonio Quartulli <ordex@autistici.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
"Martin Hundebøll" <martin@hundeboll.net>,
"Marek Lindner" <lindner_marek@yahoo.de>,
"David Miller" <davem@davemloft.net>
Subject: Re: [B.A.T.M.A.N.] linux-next: build failure after merge of the net-next tree
Date: Fri, 19 Apr 2013 09:34:09 +0200 [thread overview]
Message-ID: <20130419073409.GH20819@ritirata.org> (raw)
In-Reply-To: <20130419132127.05ea53adec329ca794d62be7@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]
Hi Stephen,
On Fri, Apr 19, 2013 at 01:21:27PM +1000, Stephen Rothwell wrote:
>
> Caused by commits 612d2b4fe0a1 ("batman-adv: network coding - save
> overheard and tx packets for decoding") and 2df5278b0267 ("batman-adv:
> network coding - receive coded packets and decode them") from the
> net-next tree interacting with commit fe8a93b95145 ("batman-adv: make
> is_my_mac() check for the current mesh only") from the net tree.
>
> I added the following merge fix patch and can carry it as necessary:
thank you very much for taking care of this.
However, as I wrote to David in the pull request which generated this noise
(http://patchwork.ozlabs.org/patch/237363/), I am now going to send a second
pull request which fixes this problem properly and adds the related kernel doc.
Your patch looks good, but I'd prefer to send my already prepared pull request.
Is it ok with you?
Cheers,
--
Antonio Quartulli
..each of us alone is worth nothing..
Ernesto "Che" Guevara
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
To: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Martin Hundebøll"
<martin-SHBFXCSm21MJGwgDXS7ZQA@public.gmane.org>,
"Marek Lindner" <lindner_marek-LWAfsSFWpa4@public.gmane.org>,
"David Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Subject: Re: linux-next: build failure after merge of the net-next tree
Date: Fri, 19 Apr 2013 09:34:09 +0200 [thread overview]
Message-ID: <20130419073409.GH20819@ritirata.org> (raw)
In-Reply-To: <20130419132127.05ea53adec329ca794d62be7-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]
Hi Stephen,
On Fri, Apr 19, 2013 at 01:21:27PM +1000, Stephen Rothwell wrote:
>
> Caused by commits 612d2b4fe0a1 ("batman-adv: network coding - save
> overheard and tx packets for decoding") and 2df5278b0267 ("batman-adv:
> network coding - receive coded packets and decode them") from the
> net-next tree interacting with commit fe8a93b95145 ("batman-adv: make
> is_my_mac() check for the current mesh only") from the net tree.
>
> I added the following merge fix patch and can carry it as necessary:
thank you very much for taking care of this.
However, as I wrote to David in the pull request which generated this noise
(http://patchwork.ozlabs.org/patch/237363/), I am now going to send a second
pull request which fixes this problem properly and adds the related kernel doc.
Your patch looks good, but I'd prefer to send my already prepared pull request.
Is it ok with you?
Cheers,
--
Antonio Quartulli
..each of us alone is worth nothing..
Ernesto "Che" Guevara
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Antonio Quartulli <ordex@autistici.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "David Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Martin Hundebøll" <martin@hundeboll.net>,
"Marek Lindner" <lindner_marek@yahoo.de>,
b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: linux-next: build failure after merge of the net-next tree
Date: Fri, 19 Apr 2013 09:34:09 +0200 [thread overview]
Message-ID: <20130419073409.GH20819@ritirata.org> (raw)
In-Reply-To: <20130419132127.05ea53adec329ca794d62be7@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]
Hi Stephen,
On Fri, Apr 19, 2013 at 01:21:27PM +1000, Stephen Rothwell wrote:
>
> Caused by commits 612d2b4fe0a1 ("batman-adv: network coding - save
> overheard and tx packets for decoding") and 2df5278b0267 ("batman-adv:
> network coding - receive coded packets and decode them") from the
> net-next tree interacting with commit fe8a93b95145 ("batman-adv: make
> is_my_mac() check for the current mesh only") from the net tree.
>
> I added the following merge fix patch and can carry it as necessary:
thank you very much for taking care of this.
However, as I wrote to David in the pull request which generated this noise
(http://patchwork.ozlabs.org/patch/237363/), I am now going to send a second
pull request which fixes this problem properly and adds the related kernel doc.
Your patch looks good, but I'd prefer to send my already prepared pull request.
Is it ok with you?
Cheers,
--
Antonio Quartulli
..each of us alone is worth nothing..
Ernesto "Che" Guevara
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-04-19 7:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-19 3:21 linux-next: build failure after merge of the net-next tree Stephen Rothwell
2013-04-19 3:21 ` Stephen Rothwell
2013-04-19 7:34 ` Antonio Quartulli [this message]
2013-04-19 7:34 ` Antonio Quartulli
2013-04-19 7:34 ` Antonio Quartulli
2013-04-19 8:13 ` [B.A.T.M.A.N.] " Stephen Rothwell
2013-04-19 8:13 ` Stephen Rothwell
2013-04-23 0:39 ` 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=20130419073409.GH20819@ritirata.org \
--to=ordex@autistici.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=lindner_marek@yahoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin@hundeboll.net \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.