From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Mon, 4 Aug 2014 11:04:05 +0200 From: Alexander Aring Message-ID: <20140804090403.GB15334@omega> References: <53DF4B10.7000209@xsilon.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <53DF4B10.7000209@xsilon.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-zigbee-devel-bounces@lists.sourceforge.net Subject: Re: [Linux-zigbee-devel] [PATCH v3 bluetooth-next] Simplify lowpan receive path so skb is freed in, lowpan_rcv when dropped. To: Martin Townsend Cc: linux-bluetooth@vger.kernel.org, Marcel Holtmann , linux-wpan@vger.kernel.org, linux-zigbee-devel@lists.sourceforge.net List-ID: 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 :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 ------------------------------------------------------------------------------ Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk _______________________________________________ Linux-zigbee-devel mailing list Linux-zigbee-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel