linux-kernel - Re: linux-next: duplicate patch in the usb 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: <2023061513-savings-legwarmer-17eb@gregkh>
Date:   Thu, 15 Jun 2023 08:48:32 +0200
From:   Greg KH <greg@...ah.com>
To:     Wolfram Sang <wsa@...-dreams.de>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Mario Limonciello <mario.limonciello@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patch in the usb tree

On Thu, Jun 15, 2023 at 08:42:26AM +0200, Wolfram Sang wrote:
> Hi,
> 
> > The following commit is also in the i2c tree as a different commit
> > (but the same patch):
> 
> thank you for the pointer!
> 
> > 
> >   7b7efc925042 ("usb: typec: ucsi: Mark dGPUs as DEVICE scope")
> > 
> > This is commit
> > 
> >   a7fbfd44c020 ("usb: typec: ucsi: Mark dGPUs as DEVICE scope")
> > 
> > in the ic2 tree.
> 
> Oh, sorry, I didn't get a mail that it was already applied to the
> usb-tree. Maybe I accidently erased it. What is the procedure now? I
> guess I revert the version in the i2c tree?

We can leave both, merges should be simple.

thanks,

greg k-h