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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 47FDCC43381 for ; Mon, 1 Apr 2019 18:12:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D70B20857 for ; Mon, 1 Apr 2019 18:12:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554142336; bh=8NPLjvZZtJm5Tpt3vghAKML5Ki7vFBAI9g3NhfspHDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kp8ad2fANNBdSp428QtUrciTXEZRK4Q8zAccODIaSJDPcFQ0v6lrVLGsKTe2WpYw4 AawtsqBFMaB9MbGkR941MrLubccggE8xPfUY0OcN7Ux+okcpPMXHm7v8whMtk3aZV9 cVmHFsIpaT2dqlCFtL09ZSas1Z3nJyEqDUFyjljY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728793AbfDAREv (ORCPT ); Mon, 1 Apr 2019 13:04:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:49584 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728019AbfDAREv (ORCPT ); Mon, 1 Apr 2019 13:04:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 591F52192C; Mon, 1 Apr 2019 17:04:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138290; bh=8NPLjvZZtJm5Tpt3vghAKML5Ki7vFBAI9g3NhfspHDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ocg5pl5kdK6+AEOSQd4UvH4y9DcIHvWQRgIhgOABp420dRDTz97QbHz2qhVw5r+Vl mM/+9no9W7CWZG9RPyca9g7CZppdfBsCg5ocvprZUpMMS47DqFgLn8NwKcrBDgjFzy TRTRjK3+T40MDiK1etrAr+gNqypKsIF7ccdWAZLU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matteo Croce , "David S. Miller" Subject: [PATCH 5.0 006/146] gtp: change NET_UDP_TUNNEL dependency to select Date: Mon, 1 Apr 2019 19:00:18 +0200 Message-Id: <20190401170048.955416656@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170048.449559024@linuxfoundation.org> References: <20190401170048.449559024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matteo Croce [ Upstream commit c22da36688d6298f2e546dcc43fdc1ad35036467 ] Similarly to commit a7603ac1fc8c ("geneve: change NET_UDP_TUNNEL dependency to select"), GTP has a dependency on NET_UDP_TUNNEL which makes impossible to compile it if no other protocol depending on NET_UDP_TUNNEL is selected. Fix this by changing the depends to a select, and drop NET_IP_TUNNEL from the select list, as it already depends on NET_UDP_TUNNEL. Signed-off-by: Matteo Croce Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -213,8 +213,8 @@ config GENEVE config GTP tristate "GPRS Tunneling Protocol datapath (GTP-U)" - depends on INET && NET_UDP_TUNNEL - select NET_IP_TUNNEL + depends on INET + select NET_UDP_TUNNEL ---help--- This allows one to create gtp virtual interfaces that provide the GPRS Tunneling Protocol datapath (GTP-U). This tunneling protocol