From patchwork Thu Sep 3 08:28:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1356425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bhv965kYnz9sTd; Thu, 3 Sep 2020 18:28:58 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kDkc2-0002eB-NB; Thu, 03 Sep 2020 08:28:54 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kDkby-0002do-PO for kernel-team@lists.ubuntu.com; Thu, 03 Sep 2020 08:28:50 +0000 Received: from mail-pj1-f72.google.com ([209.85.216.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kDkby-0002eg-C7 for kernel-team@lists.ubuntu.com; Thu, 03 Sep 2020 08:28:50 +0000 Received: by mail-pj1-f72.google.com with SMTP id c1so1216629pjq.5 for ; Thu, 03 Sep 2020 01:28:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sXzI8Gxb2nEtVC+sXeRJqslP6m43t5z4ihSJ8qIGlgg=; b=kYSjO+KpKPofNxp0Ml2oD/lRV7Lcnuy9uI7uSPAqwy8hb0TLHtwDrHHyiWFlfN0X4z fYJkI7A9oJTBG69aUxKl2yzWqaVMA1cIGza+tlpBw0aGFT6K8qOy30WULroR7JrPMGb1 sV5eMlJ+hC+ifraw6QWWG7owTP853Fo6730CYSe7p7NNhu2f4ZErEjI790DcF1XmOzUx tBc+1L9WMsxlrxZRfIDiVoQjLGrfHnzcC552v45VHuCuyYy7QRtuiCcwav6GtxZhCeLr j/qSAbbZK4yM2W0+inBtVgDmKP2egsUEKgfLEYfFllCX+nard59+WdqIaf+HprD4tZMG A8xg== X-Gm-Message-State: AOAM531MNPMVsWi5uvV4hBXn/UoHTlu9bA89isQWdgOlr3YKBLV7lTU7 DMu3yXiCWidmI1699yKDNoCg07kQPiSpBU7mR0/WNsn3dq9GFCdLZNYPbDG0p9tZksQFPcAeEYP O7xEX8Rhcf5KBnR8hZaF86jGShSmTOVIVWK4dGhj/ X-Received: by 2002:a17:902:ea86:: with SMTP id x6mr2776785plb.131.1599121728709; Thu, 03 Sep 2020 01:28:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZrV6JA/Yo83uzEMCyQ+KYpyi+IkeZVczFQ1KH7/uTSZ43AIAbm3H4y4JSqeWfb62RYlwDVg== X-Received: by 2002:a17:902:ea86:: with SMTP id x6mr2776770plb.131.1599121728438; Thu, 03 Sep 2020 01:28:48 -0700 (PDT) Received: from localhost.localdomain (223-137-95-60.emome-ip.hinet.net. [223.137.95.60]) by smtp.gmail.com with ESMTPSA id k20sm2180847pfu.197.2020.09.03.01.28.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 01:28:47 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [G][SRU][PATCH 1/1] Revert "UBUNTU: SAUCE: selftests: net: ip_defrag: modprobe missing nf_defrag_ipv6 support" Date: Thu, 3 Sep 2020 16:28:13 +0800 Message-Id: <20200903082813.25646-2-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200903082813.25646-1-po-hsu.lin@canonical.com> References: <20200903082813.25646-1-po-hsu.lin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1894062 The change to modprobe nf_defrag_ipv6 module has been applied again with commit aba69d49 ("selftests: net: ip_defrag: modprobe missing nf_defrag_ipv6 support") Remove the duplicated code to make it match with upstream. This reverts commit 6c6ab125655c04f81e244270985b077edd47fff1. Signed-off-by: Po-Hsu Lin Acked-by: Colin Ian King --- tools/testing/selftests/net/ip_defrag.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/testing/selftests/net/ip_defrag.sh b/tools/testing/selftests/net/ip_defrag.sh index ad97946..ceb7ad4 100755 --- a/tools/testing/selftests/net/ip_defrag.sh +++ b/tools/testing/selftests/net/ip_defrag.sh @@ -3,8 +3,6 @@ # # Run a couple of IP defragmentation tests. -modprobe -q nf_defrag_ipv6 - set +x set -e