netdev - Re: pull-request: can 2021-01-20

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 for Android: free password hash cracker in your pocket

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

Message-ID: <8dd62cce-7cdc-705c-4fcf-d6c383e82f39@pengutronix.de>
Date:   Wed, 20 Jan 2021 22:03:47 +0100
From:   Marc Kleine-Budde <mkl@...gutronix.de>
To:     Jakub Kicinski <kuba@...nel.org>
Cc:     netdev@...r.kernel.org, davem@...emloft.net, kernel@...gutronix.de,
        linux-can@...r.kernel.org
Subject: Re: pull-request: can 2021-01-20

On 1/20/21 9:36 PM, Jakub Kicinski wrote:
>>>> Note: Patch 1/3 touches "drivers/net/can/dev.c". In net-next/master this file
>>>> has been moved to drivers/net/can/dev/dev.c [1] and parts of it have been
>>>> transfered into separate files. This may result in a merge conflict. Please
>>>> carry this patch forward, the change is rather simple. Drop us a note if
>>>> needed. Are any actions needed with regards to linux-next?  
>>>
>>> Thanks for the note, I'm sending the PR to Linus now, so I think
>>> linux-next may never see the the conflict.  
> 
> The merge has been done now, could you double check?

Looks good!

Thanks,
Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |



Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)