From: Alexander Aring <alex.aring@gmail.com>
To: Martin Townsend <martin.townsend@xsilon.com>
Cc: linux-zigbee-devel@lists.sourceforge.net,
linux-bluetooth@vger.kernel.org, linux-wpan@vger.kernel.org,
Marcel Holtmann <marcel@holtmann.org>
Subject: Re: [PATCH v3 bluetooth-next] Simplify lowpan receive path so skb is freed in, lowpan_rcv when dropped.
Date: Mon, 4 Aug 2014 11:04:05 +0200 [thread overview]
Message-ID: <20140804090403.GB15334@omega> (raw)
In-Reply-To: <53DF4B10.7000209@xsilon.com>
Hi Martin,
still conflicts here:
M include/net/6lowpan.h
M net/6lowpan/iphc.c
M net/bluetooth/6lowpan.c
M net/ieee802154/6lowpan_rtnl.c
<stdin>:91: trailing whitespace.
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging net/ieee802154/6lowpan_rtnl.c
Auto-merging net/bluetooth/6lowpan.c
Auto-merging net/6lowpan/iphc.c
CONFLICT (content): Merge conflict in net/6lowpan/iphc.c
Auto-merging include/net/6lowpan.h
Failed to merge in the changes.
Patch failed at 0001 Simplify lowpan receive path so skb is freed in, lowpan_rcv when dropped.
Save your work in a branch.
Do you have bluetooth-next in your remotes? Then run "git remote update
$REMOTE_NAME" and checkout $REMOTE_NAME/master, then use git cherry-pick
to add patches from the branch.
- Alex
next prev parent reply other threads:[~2014-08-04 9:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 8:57 [PATCH v3 bluetooth-next] Simplify lowpan receive path so skb is freed in, lowpan_rcv when dropped Martin Townsend
2014-08-04 9:04 ` Alexander Aring [this message]
2014-08-04 9:16 ` Martin Townsend
2014-08-04 9:36 ` Alexander Aring
2014-08-04 9:41 ` Martin Townsend
2014-08-04 9:41 ` Alexander Aring
2014-08-04 9:47 ` Martin Townsend
2014-08-04 9:48 ` Alexander Aring
2014-08-04 15:35 ` Marcel Holtmann
2014-08-04 15:41 ` Alexander Aring
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=20140804090403.GB15334@omega \
--to=alex.aring@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=linux-zigbee-devel@lists.sourceforge.net \
--cc=marcel@holtmann.org \
--cc=martin.townsend@xsilon.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