Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp261882ybz; Thu, 30 Apr 2020 21:18:54 -0700 (PDT) X-Google-Smtp-Source: APiQypKRUf66HBJwwF2+441/odXM5D8IA5XAjdUiEZM6QztejMYjXcQyQZNA6A4jfFJPhCdobOB9 X-Received: by 2002:aa7:d60a:: with SMTP id c10mr2071332edr.66.1588306734655; Thu, 30 Apr 2020 21:18:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588306734; cv=none; d=google.com; s=arc-20160816; b=solKHif5uOh3eSNrAAbzPHKeOiFdHpHWSLMenXxQnY+7bJ8tYMspUvoN+DNaphCnWw Y9/9n5HUilF+w3i3oL+f5TgFGeHbeGWUbkBRyEBzpM1BvhxKU4+OM4M1UL+olDFSFsEf UZdgvAUa1BzXP1cwBtS4YJISsEDV5f17Sx7DQ5pnShfh2MWJivONizx4WEojxbPZ5tzP rMUIHuBbPyzo+5q54RhDIQBUPMTWuPZlh6aHAxPFe4oqFf0UbE+jqtOIoXrisEjWY+wN d62OILK9yTaqJtrfmshKw1rAeqKpo0JUWAs/RGRp/PmRPHt3yER3jmA2WrGe/mIz6SBn PPUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:references:cc:to:from:subject:dkim-signature; bh=X5v6XgBQvXYCV/k6yfv1MAtOVy8utTNfVch0kLIBlYE=; b=wGYsEdx9jcV3XeA4ETPAxb8g6HkDQZVh3v7mBW6Jh0VSV5fw35Cd3q3NHVpjTPcbpj z2pENvsWiqdNyPFZ4j7oIZZC+SPJ0R27efwwvDi3hymwMAW49XY1W4yGMoGuExZG/mPn bffx4392AkJggd1jpr3BADdUonRk8Bj6CjJx/kXq5sz9Qx8AhWCLJNe2ok0GX25oiIls 0rI9ZYJUPCwSTrFcthfKN7XBItaX20urRbPSFk0tzEj2AcPk2/lYAvTaGT4USA1WV6fk thWJEWrFHpvbLTEYjXOf3+Eo7iGxJ9hmXrNN6OGdRtvVeeYMbJRhaG+k+L4SlnfV9dC6 XP6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@embeddedor.com header.s=default header.b=N4SldThh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e9si910641eds.63.2020.04.30.21.18.31; Thu, 30 Apr 2020 21:18:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@embeddedor.com header.s=default header.b=N4SldThh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728229AbgEAEOX (ORCPT + 99 others); Fri, 1 May 2020 00:14:23 -0400 Received: from gateway21.websitewelcome.com ([192.185.45.31]:42101 "EHLO gateway21.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726452AbgEAEOX (ORCPT ); Fri, 1 May 2020 00:14:23 -0400 X-Greylist: delayed 1450 seconds by postgrey-1.27 at vger.kernel.org; Fri, 01 May 2020 00:14:22 EDT Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway21.websitewelcome.com (Postfix) with ESMTP id 8A778400C36DC for ; Thu, 30 Apr 2020 22:50:12 -0500 (CDT) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id UMgmjfhzh8vkBUMgmjOrq1; Thu, 30 Apr 2020 22:50:12 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=embeddedor.com; s=default; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:MIME-Version:Date:Message-ID:References:Cc:To:From:Subject:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=X5v6XgBQvXYCV/k6yfv1MAtOVy8utTNfVch0kLIBlYE=; b=N4SldThhN2NFbW+d8EcfmV1Hpr 5T02bteGw36ZL/u44B8sSa6+l7WdcElpXlEPo5In9M6PIGaHN4UQFdvKgXFbohfDqg3OiyRYKpVCi 91Mm1dk3fKkLYtn4JTlA08CHv/uNQkj/FkPbwdZHQbAxQ2FX6TMCgMBwVWwjSkGzWlP5SfQ5VaCHV 1VexxlLorJ88O3zkvsKqWi8c0LATvjv3WSw+OtaGw6H1DnviXgGrbWtANouiChDfclLMfBrOUKK3Y yaeloFp6ln9CgWhzh7BgiDMUUZ93QVlrjUZDcPOQmEecR1ow4e507nXMvhqjLCNgcCPQgpPX1j80I mA6g9XYQ==; Received: from [189.207.59.248] (port=58874 helo=[192.168.15.9]) by gator4166.hostgator.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92) (envelope-from ) id 1jUMgm-002kze-2o; Thu, 30 Apr 2020 22:50:12 -0500 Subject: Re: linux-next: manual merge of the mlx5-next tree with the kspp-gustavo tree From: "Gustavo A. R. Silva" To: Stephen Rothwell , David Miller , Networking Cc: Leon Romanovsky , Linux Next Mailing List , Linux Kernel Mailing List , Huy Nguyen , Saeed Mahameed , Raed Salem References: <20200429120625.2b5bb507@canb.auug.org.au> <20200501131230.58835994@canb.auug.org.au> <32eb40f0-a17b-5a7f-41e0-0f30a507fc31@embeddedor.com> Autocrypt: addr=gustavo@embeddedor.com; keydata= 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 VtSixD1uOgytAP7RWS474w== Message-ID: <585d76be-a2e7-1da6-9a9a-f46f14aea222@embeddedor.com> Date: Thu, 30 Apr 2020 22:54:33 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <32eb40f0-a17b-5a7f-41e0-0f30a507fc31@embeddedor.com> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.207.59.248 X-Source-L: No X-Exim-ID: 1jUMgm-002kze-2o X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: ([192.168.15.9]) [189.207.59.248]:58874 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 15 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen, On 4/30/20 22:30, Gustavo A. R. Silva wrote: >> This is now a conflict between the net-next and kspp-gustavo trees. >> > > Thanks for reporting this. I think the best solution, for now, is to remove the > changes from my tree. I'll do it right away. > I just updated my -next tree. This conflict should be resolved now. :) Thanks -- Gustavo