From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934270AbcCHAhv (ORCPT ); Mon, 7 Mar 2016 19:37:51 -0500 Received: from ozlabs.org ([103.22.144.67]:58041 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934416AbcCHAhW (ORCPT ); Mon, 7 Mar 2016 19:37:22 -0500 Date: Tue, 8 Mar 2016 11:37:19 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Parthasarathy Bhuvaragan Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20160308113719.68a56294@canb.auug.org.au> 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: net/tipc/subscr.c between commit: 4de13d7ed6ff ("tipc: fix nullptr crash during subscription cancel") from the net tree and commit: 7c13c6224123 ("tipc: introduce tipc_subscrb_subscribe() routine") (and following ones) from the net-next tree. I fixed it up (I used the net-next tree version as it is not obvious tha the net tree patch is still needed) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the net-next tree with the net tree Date: Tue, 8 Mar 2016 11:37:19 +1100 Message-ID: <20160308113719.68a56294@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Sender: linux-kernel-owner@vger.kernel.org To: David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Parthasarathy Bhuvaragan List-Id: linux-next.vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/tipc/subscr.c between commit: 4de13d7ed6ff ("tipc: fix nullptr crash during subscription cancel") from the net tree and commit: 7c13c6224123 ("tipc: introduce tipc_subscrb_subscribe() routine") (and following ones) from the net-next tree. I fixed it up (I used the net-next tree version as it is not obvious tha the net tree patch is still needed) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell