From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753241AbbKBKzL (ORCPT ); Mon, 2 Nov 2015 05:55:11 -0500 Received: from mail-db3on0086.outbound.protection.outlook.com ([157.55.234.86]:19097 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751910AbbKBKzH (ORCPT ); Mon, 2 Nov 2015 05:55:07 -0500 X-Greylist: delayed 916 seconds by postgrey-1.27 at vger.kernel.org; Mon, 02 Nov 2015 05:55:06 EST Authentication-Results: spf=pass (sender IP is 193.47.165.134) smtp.mailfrom=mellanox.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=mellanox.com; Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree To: Stephen Rothwell , Doug Ledford References: <20151101184815.1c854867@canb.auug.org.au> CC: , , Steve Wise , "J. Bruce Fields" From: Sagi Grimberg Message-ID: <56373D85.4070408@mellanox.com> Date: Mon, 2 Nov 2015 12:40:05 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151101184815.1c854867@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.223.0.53] X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;DB3FFO11FD030;1:pCgirh3pfa77VQQIkNZDA1d5FjGtlH1+Gra47Yev+AogeToNoehKY3MOEwg42yDrNzhvXEDN31mjfMu8FCQH/2I/HTKNCuPTsD/QK8521oywNelGzSufwUS42mP2uw8hM7bmerFkhTLTp8wCGRzRC8kS2sMfYwMhfy7QZqQEl4vRaAfje1jwdk/gH5ednCDlaBfhUNI4+ke3rF4eIbTLy/RCpIWKwx7XIl49DTf49bCLUrr8ZIsUMcZHCyE1H8sH9Cdx8zess5MbBQ8z5Lv/X3EBTCyeGBspwNrY1oVAllpHpnqATrQB7kOhr5v4976VeAQ7EjYiddL0hm33/YBefhJwxf+s8PwGYLv00qme8eRInfvYNAgGPxJKIqN8wNuC X-Forefront-Antispam-Report: CIP:193.47.165.134;CTRY:IL;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(5007970100001)(87266999)(36756003)(65816999)(76176999)(6806005)(23746002)(65806001)(50986999)(83506001)(54356999)(11100500001)(5004730100002)(50466002)(230700001)(80316001)(5008740100001)(65956001)(59896002)(77096005)(106466001)(189998001)(575784001)(47776003)(86362001)(4001350100001)(87936001)(2950100001)(99136001)(97736004)(5001770100001)(92566002)(64126003)(33656002)(3940600001);DIR:OUT;SFP:1101;SCL:1;SRVR:DB3PR05MB347;H:mtlcas13.mtl.com;FPR:;SPF:Pass;PTR:ErrorRetry;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;DB3PR05MB347;2:qTW2OwEv0a23JP0elgTbEP0AyU6nahw2rbcTOpA3ltndHbI96Wa/R5gO1sSQ1OPVkrQqa9GckbMh1Dm2nZbNwMxsbR1C+8daQiH8FnZeZTgpoBjyba6o2dWgE4SJEk0FC1BVfjC5wHnvD+KSsntRVnevB0dDmfaIa+eevX1JKxg=;3:Q9W6NM0489TTkbiv5YOkVc6XUqv+6c9dYXEC6QuhgHl2uzcS8RL79Qwi9YfjqtFn1Y0/eYyeTaf+hiVHr9QbC+KqZGc9jQRf8y/NqGsiQLdlHuonlmBMYH5tjygqMJRBzej7vOzccFjvTDFuHF66FDIEK/fvRT11mGjYU5qYwpbb2zjA0RVdaQxOZHc1uuOnXwso6NpNn/bM6VqcIFeBLogLZ9OtHqZD9X+PT0rp8DapvA4R/+m1Osc5OhbfpkrqRlyIKA84B++tLMnjOVwLZg==;25:73kF8aCp8kkLDOsT5uQMqad78dozn0aRiELU2drZ+aHgtNTUgUuZDKEEXTH+RLd6qdhynC3VWloOUGag+beYHLtK6FBZl0RdyWn+3nIDfmBPYrB7/7wbbx1MD0iwxds2vA27u7hQuWyI6OQjmW8QejU7N+vf+JGrh3qtRr5HynY0ARiF6BxQGItvbtTyhbduYtuVeb7cjEe4x2aHu9wVJTQpQKDRA0l2sDc+F5RU2vgrDq9pK2xRPlYPdDarp2gf X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(8251501001);SRVR:DB3PR05MB347; X-Microsoft-Exchange-Diagnostics: 1;DB3PR05MB347;20:lvMybZzKtJShAQIRAvAgcyxTkNpcydZahUJaBIDhIp4FBmyTkHdrb7DyNO7HlA53jhp7yMYYlaD5OdaeR0G7mvKJAvqVIf7tRynzfq9CxnIP52ovfWJgww8ehG4y5JKeQLJ7+laYkmr5lI48IZnf0oE1/Kbk11cXhuL4Jb1BOD2utGd/sal7cABu8m2kBl8GNSJdXLYnVesxdLc77GWRTYsdRrJkP/3m2ahQLp4H2jdUOxkq0HWumo7BJdCpgPTqIWn3pkuAp0zqCNqHf8p3HwCViY9tcqQgZi0rbvKCWp+rOO4OAjND1JeRDDvCE7oXHCDKknXkNSNOiLh2qAltFFOBwOYXKBmmmo6XAn+pOJ6fWV3TfqrWFjWZmwAoSFnlWpywizdepwuZ2nrodnnshBgJvvNmBmKOSxrYMPLgZoUiURjquP7bc407QINXZuwsv+ini6dZW9n0pOfM/ECI0r98aCvlBrFqOd5LkfiLuzgdoEVRJGcX8LQdG6RqkLfm;4:cFuc4QIrZFISVmpUpt3n0aijYWmjySeL47fQ1ZfPrONJ8Oedu9ABgYbdh6NRRC7Jogx1YJU6MMA3MJiY+2t5YyfSYFTqKDnUWTLS7oGQfLcFT0oK+snZgys5ufr6gFoKFti+FKLkb3EHq+yGD6AdaOlojOb2nClC1Fjp5CdWpIHyxNHoDLFYstW0pjdtAj/91CtInJ53i3QlnWd+2OESUuRUhxiduhM5/g5YXI1Lm9tuCe7ySa4vGsx5+Y76Bu2WQ+wtq8UKDz8gnC73UoUG9cxxuPP8dr5s1bVv8PJkHmmsT48J1/2meNmkWngWOoYIz+WN26k86cBQnz3b1xnomanFRCyKQyhkJEt2PDM7Iz83Sa605cR6fQwIvudilwNx X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001);SRVR:DB3PR05MB347;BCL:0;PCL:0;RULEID:;SRVR:DB3PR05MB347; X-Forefront-PRVS: 0748FF9A04 X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;DB3PR05MB347;23:jJTu0VGrjE09G8t8n5hemVrRNo+IyYpu9rNYLx?= =?Windows-1252?Q?ba9VoNOll0NpxYta8vi7u01qyflRHiIXkWn81ix13gXWTwTBZ1AX6VlK?= =?Windows-1252?Q?bMnvc3NF9ijlsmlITbCCTf52oZTjK+pRirGjYo7aOefWHapi0P3LCakx?= =?Windows-1252?Q?YG8zKr3TNV/ZBpZNA1mznob/QkZ9c6f7tfhqsIPBaMg8xWMGAKAZMAdE?= =?Windows-1252?Q?RmJ66PTVHXEXUwh2/l4326jJAZm37wztkAq2eFDxU1qG2Ko0AU8K/Uay?= =?Windows-1252?Q?OuEt3ARC7cZjayn4oRDiRzvWWBmXTHU46LNnER178+NECcmJFVowwv4K?= =?Windows-1252?Q?R62F9qSFJDW6n1ifojmEUo6ALpXTI9MrV/HYCulGjQVe7oXgulXqjmak?= =?Windows-1252?Q?bmu0VSkdc3e8JEtWyHCb9jr13ygD+0Lo6zmPozshT5Ake714Srv0XXvr?= =?Windows-1252?Q?F69s/P+CU3Csjyh3dvoOxS365+kICAqR1BwIPlNRFF5CSxWuSDFc1L/7?= =?Windows-1252?Q?kP1MzJ45x5JseNQUs9sde7HlFoHspYLkHHPvy5C7Kym74UsIlXLsfZaq?= =?Windows-1252?Q?uSmSVuuygW73IxupNf59G8IF+tKZexJoia+JFGdbTyz3M6qh3y1BmZiS?= =?Windows-1252?Q?VnXJMJf6n+CxkUAB2SSfgKhdODUPYAEFJk/+pOz9/BH8OA6hMbyQ0EWR?= =?Windows-1252?Q?zMZq2LKpvTgqVYMBQS7dwJdNfAU1DFtjBX++vFzsGa0EUssE84/01auW?= =?Windows-1252?Q?VK4XNg3X4SQAo24kOIiM7VK/fMfZ6Evj7BCPI3V29TllPnrsQnK4Gy/K?= =?Windows-1252?Q?9C/jQVSTPM5OI7ZwwoUnx2jcy5DrO+lvxAePkefQhsyMZoP3LEb9zlMG?= =?Windows-1252?Q?vOBpjEQOEr8mqNgWt5srXbEw8P2oILGTfqSEM9/ThmAaVJVK2s36bIWa?= =?Windows-1252?Q?Cocyf48+xSjokEKeO99Pm44OeVSbfdXybz/XOcWBuaPStQVU7Gz6PfAP?= =?Windows-1252?Q?lJTB+G+yHf0OCCMp8I7h9qdtufuu2WioFkGGr3P9a0div3W853okQz6U?= =?Windows-1252?Q?GsqTYpYI3zsbzb5lEHoDKrTCsTvUMd9QzGQqgB/ZaFR5f8F42hg2e0hB?= =?Windows-1252?Q?wOrug7q87/vSqp761QokE+dZ7xZCfpPUzIUGvJeAz9?= X-Microsoft-Exchange-Diagnostics: 1;DB3PR05MB347;5:3qHa+hcSLd/kKPC91eToQXCMMEM5n5StNGIESHApjtuB6oEqwxfOb3sdH+7JSNpR13/AqAaOFWKzaoxIPfNN8rkZm3hFhRpWzm0UQK0jXsbn2ndzzxbizGz9AgrL64LrTWzc50BVNbVAsUKlQ6MnOg==;24:OcFgGe51JT9cQ8FqWEri9wFo/I6CkE/5OU9VjfClezHXPDKLFJzNUPvJaHWe86M/Y/TKePsozVIYUbBxocwSdzrRhJt9N9pwgjdkx91XnLc=;20:6ttoeF4ZRMN9Nho0kfMeP8yUr/M2jaItO/LirOZ5eBBCbX2D6er0WBV0VC9Ol/+FCmh8fgzI2TjEnJDCIw7lwA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2015 10:39:42.0764 (UTC) X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=a652971c-7d2e-4d9b-a6a4-d149256f461b;Ip=[193.47.165.134];Helo=[mtlcas13.mtl.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR05MB347 X-Microsoft-Exchange-Diagnostics: 1;DB3PR05MB041;2:o9orJr9w9t19TSdyVZlOCMRInmL1h5sPLPIzbzpnI9/sWVWfQKtS2IO1TAtTi5q4M9USluQmYH8Ejl+8ky5C5VzyUClUAl+Fa7Etb2MJYW7TPqKYeFzGnIxfXFxOuIEyQSboaxU8KRh1g1JlLH/JPsZwTPg55NPoF9RwkYyqTaU=;23:3F6x0Q/Nb2FXWZyuqjJjk0C1MC1H0fUQedX9rP8LfOXWnXARh4ERpjiqSVnWgutzT7MQ064x267TVmf8RmbsPPUh6dt0fWm/xSqjzKQgpTIDm7QnMtCFbijCiEh8QsV0DQRcwTtXZ7L9KLOxVlEexTl9BGCQVmAY783lnjJ/Y3sgdn9cj89+4FTjokhT7cwY X-OriginatorOrg: Mellanox.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > Hi Doug, > > Today's linux-next merge of the rdma tree got a conflict in: > > net/sunrpc/xprtrdma/svc_rdma_recvfrom.c > > between commit: > > c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset") > > from Linus' tree and commit: > > 412a15c0fe53 ("svcrdma: Port to new memory registration API") > > from the rdma tree. > > I fixed it up (I think - see below) and can carry the fix as necessary > (no action is required). > Hi Stephen, The fix looks correct to me. Cheers, Sagi. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sagi Grimberg Subject: Re: linux-next: manual merge of the rdma tree with Linus' tree Date: Mon, 2 Nov 2015 12:40:05 +0200 Message-ID: <56373D85.4070408@mellanox.com> References: <20151101184815.1c854867@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-db3on0086.outbound.protection.outlook.com ([157.55.234.86]:19097 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751910AbbKBKzH (ORCPT ); Mon, 2 Nov 2015 05:55:07 -0500 In-Reply-To: <20151101184815.1c854867@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Doug Ledford Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Steve Wise , "J. Bruce Fields" > Hi Doug, > > Today's linux-next merge of the rdma tree got a conflict in: > > net/sunrpc/xprtrdma/svc_rdma_recvfrom.c > > between commit: > > c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset") > > from Linus' tree and commit: > > 412a15c0fe53 ("svcrdma: Port to new memory registration API") > > from the rdma tree. > > I fixed it up (I think - see below) and can carry the fix as necessary > (no action is required). > Hi Stephen, The fix looks correct to me. Cheers, Sagi.