Return-Path: <cyrus@holtmann.org>
Date: Mon, 4 Aug 2014 11:04:05 +0200
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.
Message-ID: <20140804090403.GB15334@omega>
References: <53DF4B10.7000209@xsilon.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
In-Reply-To: <53DF4B10.7000209@xsilon.com>
Sender: linux-bluetooth-owner@vger.kernel.org
List-ID: <linux-bluetooth.vger.kernel.org>

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