From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752725AbcAGKmo (ORCPT ); Thu, 7 Jan 2016 05:42:44 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:36462 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751403AbcAGKml (ORCPT ); Thu, 7 Jan 2016 05:42:41 -0500 From: Deepa Dinamani X-Google-Original-From: Deepa Dinamani Date: Thu, 7 Jan 2016 02:42:34 -0800 To: Michael Adam , Deepa Dinamani , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org Subject: Re: [RFC 13/15] kernel: time: change inode_timespec to timespec64 Message-ID: <20160107104233.GB16539@deepa-ubuntu> References: <1452144972-15802-1-git-send-email-deepa.kernel@gmail.com> <1452144972-15802-14-git-send-email-deepa.kernel@gmail.com> <20160107085030.GB27847@samba.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160107085030.GB27847@samba.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jan 07, 2016 at 09:50:30AM +0100, Michael Adam wrote: > Hi, > > the patch contains a conflict resolution artifact.. > Thanks, I've fixed it in my tree now. I will wait to hear other comments before I send an update. -Deepa