From patchwork Tue Jun 25 02:25:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1121729 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="Ja9XtHDE"; 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 45Xqlf5N2Xz9sCJ; Tue, 25 Jun 2019 12:26:06 +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 1hfb9n-0003do-5n; Tue, 25 Jun 2019 02:26:03 +0000 Received: from mail-pl1-f196.google.com ([209.85.214.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1hfb9k-0003c5-Qj for kernel-team@lists.ubuntu.com; Tue, 25 Jun 2019 02:26:00 +0000 Received: by mail-pl1-f196.google.com with SMTP id w24so68294plp.2 for ; Mon, 24 Jun 2019 19:26:00 -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=VzPCcvjoWWVZ/P4KGCdzD5Ee4frcDvT1K5nNrI7qV8k=; b=Ja9XtHDESGmaBBxxQWa+b+FaPbSrWxFu4nH/j+W8uW37d8wIxSbdp8bYD9Uf7NHhtv L4jDDQ1ZdVrXtXbAewtP0BGemx7j3jqVn9BXFJQi6YL+rkcP4nc5vQgjXTKNBFvd6GC7 SQwMRV6XfDVp8QIfJMpXgoeKd6K7zpAXy0PfhU7a2AjKoA+C68tyTszzwDucgZ96yNFZ v7I0aTtb8WdXNRtHrWYI/N+kaGVCMFivT/N8kUzXlMlLdllgz5Zb6RWX6EEoTA+wTYEN dwt4Rj7NZQROP2i2jLTio/uROeBj8KeaHib+0RHhpuWr7zrb0MFs+5akdEPtgcwmujrj 18Zg== 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=VzPCcvjoWWVZ/P4KGCdzD5Ee4frcDvT1K5nNrI7qV8k=; b=XAJh4S4P+B0aQ327f1KaWOJaZa1cKErvUKm+vXGUOzbfmb72ZYTTKrZXIFWJsSf5SH EZE2ue8OrWM92imNpeUm2lTww7Zefz9n+vmhGzeqQ459Z3iKkjWQm5pE57ucr4cYRrh2 6hD0Ca6IbfMN8dJtzLVdri3bRRbh0OY1OBloHPXbbEwX71yT11K+MyskTN9U9/J96+Cf aR/Rw24HAJNJN/t9I3MkArOXD1zh8kbW8gkhjVtmGuoh5nVvQD4Pw9yewLPQ6SijQ1lw h45WGA8/ItdicFyp0qFKxVEZPB5RZVufNoKapgYkui1SDUZFwpCorVZpFfXKIAsQ22mK zYTg== X-Gm-Message-State: APjAAAUdMpJMV5ck5MeOFM/HJdt0qhY7D5kduubvasyJnifgK7iU5RpX Qv+HOzIecnBYvKANarnhHhsCx6gE X-Google-Smtp-Source: APXvYqwf5OKy7NouGjiTHjWJ7onIT0AJh1ZOiksODhJiuuLj9tcIaGeanOrM0WZMW68oLKYLFTcbsA== X-Received: by 2002:a17:902:2aa9:: with SMTP id j38mr109576534plb.206.1561429559005; Mon, 24 Jun 2019 19:25:59 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id r3sm10801666pgp.51.2019.06.24.19.25.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jun 2019 19:25:58 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2][SRU][C] UBUNTU: [Config] update configs and annotations for ASIX renamed Date: Tue, 25 Jun 2019 10:25:49 +0800 Message-Id: <20190625022549.924-4-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 7e6b35a739b8..5a5276230836 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -5633,7 +5633,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 1d1deec22291..8573d7253dc0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -692,7 +692,6 @@ CONFIG_ARM_UNWIND=y CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m CONFIG_ARM_VIRT_EXT=y CONFIG_AS3935=m -CONFIG_ASIX_PHY=m CONFIG_ASN1=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_ASUS_LAPTOP=m @@ -835,6 +834,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