linux-kernel - linux-next: manual merge of the net tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210319082939.77495e55@canb.auug.org.au>
Date:   Fri, 19 Mar 2021 08:29:39 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Leon Romanovsky <leon@...nel.org>,
        Leon Romanovsky <leonro@...dia.com>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Marc Kleine-Budde <mkl@...gutronix.de>,
        Stephane Grosjean <s.grosjean@...k-system.com>
Subject: linux-next: manual merge of the net tree with Linus' tree

Hi all,

Today's linux-next merge of the net tree got a conflict in:

  drivers/net/can/usb/peak_usb/pcan_usb_fd.c

between commit:

  6417f03132a6 ("module: remove never implemented MODULE_SUPPORTED_DEVICE")

from Linus' tree and commit:

  59ec7b89ed3e ("can: peak_usb: add forgotten supported devices")

from the net tree.

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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped