lkml.org 
[lkml]   [2017]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 04/35] MIPS: Update defconfigs for NF_CT_PROTO_DCCP/UDPLITE change
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit 9ddc16ad8e0bc7742fc96d5aaabc5b8698512cd1 upstream.

    In linux-4.10-rc, NF_CT_PROTO_UDPLITE and NF_CT_PROTO_DCCP are bool
    symbols instead of tristate, and kernelci.org reports a bunch of
    warnings for this, like:

    arch/mips/configs/malta_kvm_guest_defconfig:63:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE
    arch/mips/configs/malta_defconfig:62:warning: symbol value 'm' invalid for NF_CT_PROTO_DCCP
    arch/mips/configs/malta_defconfig:63:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE
    arch/mips/configs/ip22_defconfig:70:warning: symbol value 'm' invalid for NF_CT_PROTO_DCCP
    arch/mips/configs/ip22_defconfig:71:warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE

    This changes all the MIPS defconfigs with these symbols to have them
    built-in.

    Fixes: 9b91c96c5d1f ("netfilter: conntrack: built-in support for UDPlite")
    Fixes: c51d39010a1b ("netfilter: conntrack: built-in support for DCCP")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/14999/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/configs/ip22_defconfig | 4 ++--
    arch/mips/configs/malta_defconfig | 4 ++--
    arch/mips/configs/malta_kvm_defconfig | 4 ++--
    arch/mips/configs/malta_kvm_guest_defconfig | 4 ++--
    arch/mips/configs/maltaup_xpa_defconfig | 4 ++--
    arch/mips/configs/nlm_xlp_defconfig | 2 +-
    arch/mips/configs/nlm_xlr_defconfig | 2 +-
    7 files changed, 12 insertions(+), 12 deletions(-)

    --- a/arch/mips/configs/ip22_defconfig
    +++ b/arch/mips/configs/ip22_defconfig
    @@ -68,8 +68,8 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
    CONFIG_NF_CONNTRACK=m
    CONFIG_NF_CONNTRACK_SECMARK=y
    CONFIG_NF_CONNTRACK_EVENTS=y
    -CONFIG_NF_CT_PROTO_DCCP=m
    -CONFIG_NF_CT_PROTO_UDPLITE=m
    +CONFIG_NF_CT_PROTO_DCCP=y
    +CONFIG_NF_CT_PROTO_UDPLITE=y
    CONFIG_NF_CONNTRACK_AMANDA=m
    CONFIG_NF_CONNTRACK_FTP=m
    CONFIG_NF_CONNTRACK_H323=m
    --- a/arch/mips/configs/malta_defconfig
    +++ b/arch/mips/configs/malta_defconfig
    @@ -59,8 +59,8 @@ CONFIG_NETFILTER=y
    CONFIG_NF_CONNTRACK=m
    CONFIG_NF_CONNTRACK_SECMARK=y
    CONFIG_NF_CONNTRACK_EVENTS=y
    -CONFIG_NF_CT_PROTO_DCCP=m
    -CONFIG_NF_CT_PROTO_UDPLITE=m
    +CONFIG_NF_CT_PROTO_DCCP=y
    +CONFIG_NF_CT_PROTO_UDPLITE=y
    CONFIG_NF_CONNTRACK_AMANDA=m
    CONFIG_NF_CONNTRACK_FTP=m
    CONFIG_NF_CONNTRACK_H323=m
    --- a/arch/mips/configs/malta_kvm_defconfig
    +++ b/arch/mips/configs/malta_kvm_defconfig
    @@ -60,8 +60,8 @@ CONFIG_NETFILTER=y
    CONFIG_NF_CONNTRACK=m
    CONFIG_NF_CONNTRACK_SECMARK=y
    CONFIG_NF_CONNTRACK_EVENTS=y
    -CONFIG_NF_CT_PROTO_DCCP=m
    -CONFIG_NF_CT_PROTO_UDPLITE=m
    +CONFIG_NF_CT_PROTO_DCCP=y
    +CONFIG_NF_CT_PROTO_UDPLITE=y
    CONFIG_NF_CONNTRACK_AMANDA=m
    CONFIG_NF_CONNTRACK_FTP=m
    CONFIG_NF_CONNTRACK_H323=m
    --- a/arch/mips/configs/malta_kvm_guest_defconfig
    +++ b/arch/mips/configs/malta_kvm_guest_defconfig
    @@ -59,8 +59,8 @@ CONFIG_NETFILTER=y
    CONFIG_NF_CONNTRACK=m
    CONFIG_NF_CONNTRACK_SECMARK=y
    CONFIG_NF_CONNTRACK_EVENTS=y
    -CONFIG_NF_CT_PROTO_DCCP=m
    -CONFIG_NF_CT_PROTO_UDPLITE=m
    +CONFIG_NF_CT_PROTO_DCCP=y
    +CONFIG_NF_CT_PROTO_UDPLITE=y
    CONFIG_NF_CONNTRACK_AMANDA=m
    CONFIG_NF_CONNTRACK_FTP=m
    CONFIG_NF_CONNTRACK_H323=m
    --- a/arch/mips/configs/maltaup_xpa_defconfig
    +++ b/arch/mips/configs/maltaup_xpa_defconfig
    @@ -61,8 +61,8 @@ CONFIG_NETFILTER=y
    CONFIG_NF_CONNTRACK=m
    CONFIG_NF_CONNTRACK_SECMARK=y
    CONFIG_NF_CONNTRACK_EVENTS=y
    -CONFIG_NF_CT_PROTO_DCCP=m
    -CONFIG_NF_CT_PROTO_UDPLITE=m
    +CONFIG_NF_CT_PROTO_DCCP=y
    +CONFIG_NF_CT_PROTO_UDPLITE=y
    CONFIG_NF_CONNTRACK_AMANDA=m
    CONFIG_NF_CONNTRACK_FTP=m
    CONFIG_NF_CONNTRACK_H323=m
    --- a/arch/mips/configs/nlm_xlp_defconfig
    +++ b/arch/mips/configs/nlm_xlp_defconfig
    @@ -111,7 +111,7 @@ CONFIG_NETFILTER=y
    CONFIG_NF_CONNTRACK=m
    CONFIG_NF_CONNTRACK_SECMARK=y
    CONFIG_NF_CONNTRACK_EVENTS=y
    -CONFIG_NF_CT_PROTO_UDPLITE=m
    +CONFIG_NF_CT_PROTO_UDPLITE=y
    CONFIG_NF_CONNTRACK_AMANDA=m
    CONFIG_NF_CONNTRACK_FTP=m
    CONFIG_NF_CONNTRACK_H323=m
    --- a/arch/mips/configs/nlm_xlr_defconfig
    +++ b/arch/mips/configs/nlm_xlr_defconfig
    @@ -91,7 +91,7 @@ CONFIG_NETFILTER=y
    CONFIG_NF_CONNTRACK=m
    CONFIG_NF_CONNTRACK_SECMARK=y
    CONFIG_NF_CONNTRACK_EVENTS=y
    -CONFIG_NF_CT_PROTO_UDPLITE=m
    +CONFIG_NF_CT_PROTO_UDPLITE=y
    CONFIG_NF_CONNTRACK_AMANDA=m
    CONFIG_NF_CONNTRACK_FTP=m
    CONFIG_NF_CONNTRACK_H323=m

    \
     
     \ /
      Last update: 2017-03-16 16:06    [W:2.533 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site