netdev - Re: linux-next: manual merge of the pinctrl tree with the net-next 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-prev] [day] [month] [year] [list]

Message-ID: <Zy15czmqRLN4Ov4u@x1>
Date: Thu, 7 Nov 2024 18:37:39 -0800
From: Drew Fustini <drew@...7.com>
To: Linus Walleij <linus.walleij@...aro.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
	David Miller <davem@...emloft.net>,
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
	Networking <netdev@...r.kernel.org>,
	Drew Fustini <dfustini@...storrent.com>,
	Emil Renner Berthing <emil.renner.berthing@...onical.com>,
	Jisheng Zhang <jszhang@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the pinctrl tree with the net-next
 tree

On Thu, Nov 07, 2024 at 02:59:25PM +0100, Linus Walleij wrote:
> On Thu, Nov 7, 2024 at 11:43 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> > Today's linux-next merge of the pinctrl tree got a conflict in:
> >
> >   MAINTAINERS
> 
> Thanks Stephen, looks trivial enough but will try to remember to mention
> this to Torvalds.
> 
> Yours,
> Linus Walleij

Thank you for handling this conflict.

Drew