From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751945AbcESBeQ (ORCPT ); Wed, 18 May 2016 21:34:16 -0400 Received: from us-smtp-delivery-194.mimecast.com ([63.128.21.194]:56523 "EHLO us-smtp-delivery-194.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751441AbcESBeO convert rfc822-to-8bit (ORCPT ); Wed, 18 May 2016 21:34:14 -0400 From: Weston Andros Adamson To: Stephen Rothwell CC: Trond Myklebust , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , hch , Al Viro , Anna Schumaker Subject: Re: linux-next: manual merge of the nfs tree with Linus' tree Thread-Topic: linux-next: manual merge of the nfs tree with Linus' tree Thread-Index: AQHRsWhb33ObmkJlFEeIPN+fhWMrnp+/df4A Date: Thu, 19 May 2016 01:18:52 +0000 Message-ID: <92AE96EB-7EFB-4C89-B0BD-46F4B9B70A3D@primarydata.com> References: <20160519104036.3f1ac7cf@canb.auug.org.au> In-Reply-To: <20160519104036.3f1ac7cf@canb.auug.org.au> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [68.49.175.159] x-ms-office365-filtering-correlation-id: 7c785bd9-b8fc-493d-9459-08d37f838ac5 x-microsoft-exchange-diagnostics: 1;BN4PR11MB0899;5:qeKHBfQ5HvJv0o+qkkAGuQe4d+LNm3csy7kxR+W2K3GQATdAClD7BXzi59Q358CH1FDf81MYQjo1A8TrdcpgQFs1werlaLMiBP+/h1QWoEb9ma5uqUeTmsshFBywo8sD7W5haruZCTo9cxN+qXMrRw==;24:u9eBTu1fveU6D+SYyrdbNGJZPaWm3jVhiOVr98pyBPJ8NyVBjHwcCuRAgwAsYHSL6zVChmlP9ZOqDTMp0GizgHNdqo3XDhl2U/XJyjyXDzU=;7:SLbjDqa0S2m6CdyW1VxWrzuzDvkE8sgM+V4cQQPTrUV1Gi1DBZktSFVEJbMPjQk6ehNE18rVuem9y9fMUlduQjdPTygwtpoxyUySN1t5e2jJr/XJzH7jyu0eqJTihmSQDjbAWeuW3QEC9dmG78qOrYsPwxEGnRM+9bnWxEqfGEC0VjWDfWUwjNW0LmZP6NYO;20:97OCTjOJbidq3qCwwgjFbCOW2zzky3CAQWh475OyH56YJGc2kioaBwcoUg3EO78kwsQEmP+5PiypYuLtSSSffUQebVLQl38kcCmV7O/jkbXt8VKc03CSYM5Anb3tAr6tNr0UDT0J3iUuwcFsBY7c+bkeEjm/C69UrGUsmUkX5x0= x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN4PR11MB0899; x-ld-processed: 03193ed6-8726-4bb3-a832-18ab0d28adb7,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041072)(6043046);SRVR:BN4PR11MB0899;BCL:0;PCL:0;RULEID:;SRVR:BN4PR11MB0899; x-forefront-prvs: 094700CA91 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(24454002)(377454003)(76176999)(3660700001)(5004730100002)(50986999)(1220700001)(54356999)(5008740100001)(586003)(3846002)(102836003)(6116002)(33656002)(3280700002)(5002640100001)(86362001)(8936002)(81166006)(8676002)(106116001)(99286002)(10400500002)(2950100001)(2900100001)(122556002)(36756003)(87936001)(66066001)(77096005)(92566002)(82746002)(11100500001)(110136002)(189998001)(2906002)(19580405001)(19580395003)(83716003)(4326007)(104396002);DIR:OUT;SFP:1102;SCL:1;SRVR:BN4PR11MB0899;H:BN4PR11MB0897.namprd11.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; spamdiagnosticoutput: 1:23 spamdiagnosticmetadata: NSPM Content-ID: <66B8EC1521BF0847848C27807B991CEF@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: primarydata.com X-MS-Exchange-CrossTenant-originalarrivaltime: 19 May 2016 01:18:52.9550 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 03193ed6-8726-4bb3-a832-18ab0d28adb7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR11MB0899 X-MC-Unique: NPQqmCImQ6efzgUTDuga3g-1 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > On May 18, 2016, at 8:40 PM, Stephen Rothwell wrote: > > Hi Trond, > > Today's linux-next merge of the nfs tree got a conflict in: > > fs/nfs/direct.c > > between commit: > > c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO") > > from Linus' tree and commit: > > ed3743a6d4f3 ("nfs: add debug to directio "good_bytes" counting") > > from the nfs tree. The merge of the nfs tree’s commit looks good to me. -dros > > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. > > -- > Cheers, > Stephen Rothwell > > diff --cc fs/nfs/direct.c > index 741a92c470bb,7f03163b5364..000000000000 > --- a/fs/nfs/direct.c > +++ b/fs/nfs/direct.c > @@@ -591,8 -596,8 +594,8 @@@ ssize_t nfs_file_direct_read(struct kio > goto out_unlock; > > dreq->inode = inode; > - dreq->bytes_left = count; > + dreq->bytes_left = dreq->max_count = count; > - dreq->io_start = pos; > + dreq->io_start = iocb->ki_pos; > dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp)); > l_ctx = nfs_get_lock_context(dreq->ctx); > if (IS_ERR(l_ctx)) { >