From patchwork Fri Jan 29 00:59:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12054857 X-Patchwork-Delegate: kuba@kernel.org 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 903E0C433DB for ; Fri, 29 Jan 2021 01:00:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 40A8264DF5 for ; Fri, 29 Jan 2021 01:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231627AbhA2BAW (ORCPT ); Thu, 28 Jan 2021 20:00:22 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:34897 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231325AbhA2BAT (ORCPT ); Thu, 28 Jan 2021 20:00:19 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4DRfBH0Qxcz9sVF; Fri, 29 Jan 2021 11:59:34 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1611881976; bh=VbodL5Yq9EQvAyiNtgEUuG5/4QZAni95fwV8Yi57A/I=; h=Date:From:To:Cc:Subject:From; b=PQ/Sy7VzagwS7tRYYvkce70yzNxGS6+fY5dyyI7PfzlPyfedlqmLI/oU2Rd9/GXKN U56u4W7qtGL+MiyqJE6H7D/P7Eh48kYzqMLZfWahGLesA4Or1Tdsv6teMBZdzv49kA 7TC7VZHvxYNyeYl12ixUoV6wt6sRMS79Evpr2UqDwNtDeuhxuLq+XELQz1+HYRuTjX 8ifkZcQ2GR7Isgc16tcKQ6euX1TC9Ey2gG2aJQm3RZEH5erBYIEM5qHgW+K4myXmAE grTJwiRxaaYghSW7BGRnkvyGfTP5TSerU5q2ml4peVrq7CZApXknwurVfmOIN0VVlS OERFeS0JVRyew== Date: Fri, 29 Jan 2021 11:59:33 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: Dan Carpenter , Linux Kernel Mailing List , Linux Next Mailing List , Marc Kleine-Budde Subject: linux-next: manual merge of the net-next tree with Linus' tree Message-ID: <20210129115933.281690e7@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/can/dev.c between commit: b552766c872f ("can: dev: prevent potential information leak in can_fill_info()") from Linus' tree and commits: 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir") 0a042c6ec991 ("can: dev: move netlink related code into seperate file") from the net-next tree. I fixed it up (I removed the file and added the following merge fix patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Fri, 29 Jan 2021 11:57:21 +1100 Subject: [PATCH] can: dev: fix for file move Signed-off-by: Stephen Rothwell --- drivers/net/can/dev/netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c index 3ae884cdf677..867f6be31230 100644 --- a/drivers/net/can/dev/netlink.c +++ b/drivers/net/can/dev/netlink.c @@ -263,7 +263,7 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev) { struct can_priv *priv = netdev_priv(dev); struct can_ctrlmode cm = {.flags = priv->ctrlmode}; - struct can_berr_counter bec; + struct can_berr_counter bec = { }; enum can_state state = priv->state; if (priv->do_get_state)