From patchwork Tue Jun 25 02:25:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1121728 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="onhO/2Y0"; dkim-atps=neutral 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 45Xqlc4tsVz9sN6; Tue, 25 Jun 2019 12:26:04 +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 1hfb9k-0003cN-Tr; Tue, 25 Jun 2019 02:26:00 +0000 Received: from mail-pl1-f193.google.com ([209.85.214.193]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1hfb9i-0003bG-U3 for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2019 02:25:59 +0000 Received: by mail-pl1-f193.google.com with SMTP id b7so7964345pls.6 for ; Mon, 24 Jun 2019 19:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=swvV23JZ7sZgNQs2AoEsB92SYbWs/I5iLe9lhqMiH9g=; b=onhO/2Y0nGbtobilx7m0vT0p/KAdoNZPa6J8r/+kxq13D5Uq44nm+JcHsTSMWN1iI9 uDiTK+jQE4WMPOMA9V0A5cP7AZXxWXAh1vXGx9I/4s7KdcLIC1ASJxKIMScdRFzDVFLc yEzvfDepBpHsXlJIBe2BMmHmG1HVJc1T1xngj36tmhTC/Kgi3kjnVXHHPOM7so3FA1Mj 7u1sfY6qsEwkpaEyjgQFH5gVINsAERfSZFjsugFGLZ5mMDFyykRCKIbQQDV8YxCZI6g9 /C2bhD8tasEVN7c6/DSXAf2kkqmRILCut5JrUa91aiGbGsySCeJLlDvn+vFhbfp6GWtV Ifiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=swvV23JZ7sZgNQs2AoEsB92SYbWs/I5iLe9lhqMiH9g=; b=G8m7nReLMWOdrIrTxi6pJUj7I977+YVzvTJ/dxGEXU3Jhkm1KregDgwzeE/t1Ws1yk 90PMsm92DYkENygN1G2q2xQxw2rVdKuvAAcg7d9z0ooqZ9JJMe4qSFOvpRY1m1IxhQps OGCxvAdV19wNS7L1mPnOTcbyXeK0UphUcPXXh5i9osvP+MGA0kZ82V5WUy2w0HkUJJly hGX0UYEz52Tb4epGBxvo3eu1IBd0O1UNp2C3mSbjjpMiluI5R+Y1A2+/ZUZFJBF4q8gU n1cRPeEnoD2F9h4mOT+uTB1r/dqe1szFijf4lY6vys3WM+lFpmCb6M69FlswYumHjd1l Tg7Q== X-Gm-Message-State: APjAAAX1KmsWze4DOwd1XeI0tC1LZw11lHbmCNmjC6MFTtwyvAai6ljk pyDj5N+bbW8nCMISugJBG1ApdAdc X-Google-Smtp-Source: APXvYqxRv2DzKAGviQPZRFA2+hbFk/l21egxdJjdSOGPxHtw4HY18DM6dxbaHDd04O+0Y1zfLzX2Vg== X-Received: by 2002:a17:902:b284:: with SMTP id u4mr10878783plr.36.1561429556606; Mon, 24 Jun 2019 19:25:56 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id j21sm13379041pfh.86.2019.06.24.19.25.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jun 2019 19:25:55 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2][SRU][D][E] UBUNTU: [Config] update configs and annotations for ASIX renamed Date: Tue, 25 Jun 2019 10:25:48 +0800 Message-Id: <20190625022549.924-3-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190625022549.924-1-acelan.kao@canonical.com> References: <20190625022549.924-1-acelan.kao@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1834114 Below commit rename the asix.ko module in net/phy to ax88796b.ko, so update configs and annotations, too. net: phy: rename Asix Electronics PHY driver Signed-off-by: AceLan Kao --- debian.master/config/annotations | 2 +- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 008ead6f697c..fcd170365f01 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -5587,7 +5587,7 @@ CONFIG_LED_TRIGGER_PHY policy<{'amd64': 'y', 'arm64': ' CONFIG_SFP policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> CONFIG_AMD_PHY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_AQUANTIA_PHY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> -CONFIG_ASIX_PHY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> +CONFIG_AX88796B_PHY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_AT803X_PHY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_BCM7XXX_PHY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_BCM87XX_PHY policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index df275aa4a69d..810d4fc3b18a 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -719,7 +719,6 @@ CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m CONFIG_ARM_VIRT_EXT=y CONFIG_AS3935=m CONFIG_ASHMEM=m -CONFIG_ASIX_PHY=m CONFIG_ASN1=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_ASUS_LAPTOP=m @@ -861,6 +860,7 @@ CONFIG_AUTO_ZRELADDR=y CONFIG_AX25=m CONFIG_AX25_DAMA_SLAVE=y CONFIG_AX88796=m +CONFIG_AX88796B_PHY=m # CONFIG_AX88796_93CX6 is not set CONFIG_AXP20X_ADC=m CONFIG_AXP20X_POWER=m