From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932596AbcASCmh (ORCPT ); Mon, 18 Jan 2016 21:42:37 -0500 Received: from ozlabs.org ([103.22.144.67]:55901 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932548AbcASCmf (ORCPT ); Mon, 18 Jan 2016 21:42:35 -0500 Date: Tue, 19 Jan 2016 13:42:33 +1100 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Vladimir Davydov , Geert Uytterhoeven , "David S. Miller" Subject: linux-next: manual merge of the akpm tree with Linus' tree Message-ID: <20160119134233.6d1324e3@canb.auug.org.au> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; 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 Andrew, Today's linux-next merge of the akpm tree got a conflict in: include/net/tcp_memcontrol.h between commit: cdb00777ffad ("tcp_memcontrol: Forward declare cgroup_subsys and mem_cgroup stucts") from Linus' tree and commit: "net: drop tcp_memcontrol.c" from the akpm tree. I fixed it up (the latter removed the file, so I did that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au