From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751480AbbJFALx (ORCPT ); Mon, 5 Oct 2015 20:11:53 -0400 Received: from ozlabs.org ([103.22.144.67]:44780 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866AbbJFALw (ORCPT ); Mon, 5 Oct 2015 20:11:52 -0400 Date: Tue, 6 Oct 2015 11:11:48 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "David B. Robins" , Dean Jenkins Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20151006111148.27b5225a@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/usb/asix_common.c between commit: f6194bcf03e4 ("net: usb: asix: Fix crash on skb alloc failure") from the net tree and commit: 6a570814cd43 ("asix: Continue processing URB if no RX netdev buffer") (among others) from the net-next tree. I fixed it up (I dropped the net tree fixup (assuming that it was fixed in some other manner in the net-next tree)) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au