From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36FEEECE565 for ; Tue, 18 Sep 2018 08:44:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F37D21471 for ; Tue, 18 Sep 2018 08:44:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F37D21471 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=iogearbox.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729509AbeIROPs (ORCPT ); Tue, 18 Sep 2018 10:15:48 -0400 Received: from www62.your-server.de ([213.133.104.62]:56677 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729129AbeIROPs (ORCPT ); Tue, 18 Sep 2018 10:15:48 -0400 Received: from [78.46.172.3] (helo=sslproxy06.your-server.de) by www62.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.85_2) (envelope-from ) id 1g2Bc7-0000Qs-SS; Tue, 18 Sep 2018 10:44:07 +0200 Received: from [178.197.249.15] (helo=linux.home) by sslproxy06.your-server.de with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1g2Bc7-000JWR-N0; Tue, 18 Sep 2018 10:44:07 +0200 Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Stephen Rothwell , David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Vakul Garg References: <20180918101107.74d8689a@canb.auug.org.au> From: Daniel Borkmann Message-ID: <93982e9d-dc78-6423-bb9b-c5773d98e244@iogearbox.net> Date: Tue, 18 Sep 2018 10:44:06 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <20180918101107.74d8689a@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Authenticated-Sender: daniel@iogearbox.net X-Virus-Scanned: Clear (ClamAV 0.100.1/24950/Tue Sep 18 05:20:31 2018) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/18/2018 02:11 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/testing/selftests/net/tls.c > > between commit: > > 50c6b58a814d ("tls: fix currently broken MSG_PEEK behavior") > > from the net tree and commit: > > c2ad647c6442 ("selftests/tls: Add test for recv(PEEK) spanning across multiple records") > > from the net-next tree. > > 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. The test from 50c6b58a814d supersedes the one from c2ad647c6442 so the recv_peek_large_buf_mult_recs could be removed; latter was also not working correctly due to this bug. Thanks, Daniel