From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933295AbbLGWbt (ORCPT ); Mon, 7 Dec 2015 17:31:49 -0500 Received: from ozlabs.org ([103.22.144.67]:48927 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933232AbbLGWbr (ORCPT ); Mon, 7 Dec 2015 17:31:47 -0500 Date: Tue, 8 Dec 2015 09:31:44 +1100 From: Stephen Rothwell To: Al Viro , Martin Schwidefsky , Heiko Carstens Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the vfs tree with the s390 tree Message-ID: <20151208093144.05913519@canb.auug.org.au> X-Mailer: Claws Mail 3.13.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 Al, Today's linux-next merge of the vfs tree got a conflict in: drivers/s390/char/zcore.c between commit: ffa52d02c50e ("s390/zcore: remove /sys/kernel/debug/zcore/mem") from the s390 tree and commit: 41fb31e4f962 ("new helper: no_seek_end_llseek()") from the vfs tree. I fixed it up (the former removed the code modifie by the latter, so I did that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au