Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 19 Mar 2021 17:55:32 +0200
From:   Leon Romanovsky <leon@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Marc Kleine-Budde <mkl@pengutronix.de>,
        Stephane Grosjean <s.grosjean@peak-system.com>
Subject: Re: linux-next: manual merge of the net tree with Linus' tree
Message-ID: <YFTJdL1yDId+iae4@unreal>
References: <20210319082939.77495e55@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20210319082939.77495e55@canb.auug.org.au>
Precedence: bulk

On Fri, Mar 19, 2021 at 08:29:39AM +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> Today's linux-next merge of the net tree got a conflict in:
>=20
>   drivers/net/can/usb/peak_usb/pcan_usb_fd.c
>=20
> between commit:
>=20
>   6417f03132a6 ("module: remove never implemented MODULE_SUPPORTED_DEVICE=
")
>=20
> from Linus' tree and commit:
>=20
>   59ec7b89ed3e ("can: peak_usb: add forgotten supported devices")
>=20
> from the net tree.
>=20
> I fixed it up (I just removed the new MODULE_SUPPORTED_DEVICE() lines)
> 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.

Thanks Stephen, the code should be deleted and commit 59ec7b89ed3e needs
to be reverted.

>=20
> --=20
> Cheers,
> Stephen Rothwell