From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751344AbbLTXbK (ORCPT ); Sun, 20 Dec 2015 18:31:10 -0500 Received: from ozlabs.org ([103.22.144.67]:37241 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751135AbbLTXbJ (ORCPT ); Sun, 20 Dec 2015 18:31:09 -0500 Date: Mon, 21 Dec 2015 10:31:06 +1100 From: Stephen Rothwell To: Mike Marshall Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the orangefs tree with Linus' tree Message-ID: <20151221103106.7d3b9e85@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (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 Mike, Today's linux-next merge of the orangefs tree got a conflict in: Makefile between commit: 1ec218373b8e ("Linux 4.4-rc2") from Linus' tree and commit: 575e946125f7 ("Orangefs: change pvfs2 filenames to orangefs") from the orangefs tree. You should really remove this EXTRAVERSION change from the patch. I fixed it up (I use Linus' tree verison) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au