From: Daniel Borkmann <dborkman@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gustavo Padovan <gustavo@padovan.org>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Jukka Rissanen <jukka.rissanen@linux.intel.com>
Subject: Re: linux-next: manual merge of the bluetooth tree with the net/net-next trees
Date: Tue, 07 Jan 2014 15:37:45 +0100 [thread overview]
Message-ID: <52CC1139.1040701@redhat.com> (raw)
In-Reply-To: <20140107125418.986ae20298ddc55e5e657447@canb.auug.org.au>
On 01/07/2014 02:54 AM, Stephen Rothwell wrote:
> Hi Gustavo,
>
> Today's linux-next merge of the bluetooth tree got a conflict in
> net/ieee802154/6lowpan.c between commit 965801e1eb62 ("net: 6lowpan: fix
> lowpan_header_create non-compression memcpy call") from the tree and
> commit 8df8c56a5abc ("6lowpan: Moving generic compression code into
> 6lowpan_iphc.c") from the bluetooth tree.
>
> I fixed it up (I applied the following patch to move the fix into
> 6lowpan_iphc.c) and can carry the fix as necessary (no action is
> required).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 7 Jan 2014 12:52:43 +1100
> Subject: [PATCH] net: 6lowpan: fixup for code movement
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Looks good to me, thanks!
> ---
> net/ieee802154/6lowpan_iphc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
> index 11840f9e46da..e14fe8b2c054 100644
> --- a/net/ieee802154/6lowpan_iphc.c
> +++ b/net/ieee802154/6lowpan_iphc.c
> @@ -677,7 +677,7 @@ int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
> hc06_ptr += 3;
> } else {
> /* compress nothing */
> - memcpy(hc06_ptr, &hdr, 4);
> + memcpy(hc06_ptr, hdr, 4);
> /* replace the top byte with new ECN | DSCP format */
> *hc06_ptr = tmp;
> hc06_ptr += 4;
>
next prev parent reply other threads:[~2014-01-07 14:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-07 1:54 linux-next: manual merge of the bluetooth tree with the net/net-next trees Stephen Rothwell
2014-01-07 14:37 ` Daniel Borkmann [this message]
2014-01-27 22:54 ` Stephen Rothwell
2014-01-28 0:43 ` 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=52CC1139.1040701@redhat.com \
--to=dborkman@redhat.com \
--cc=davem@davemloft.net \
--cc=gustavo@padovan.org \
--cc=jukka.rissanen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 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).