linux-kernel - Re: linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20240510171049.2e0e3c56@canb.auug.org.au>
Date: Fri, 10 May 2024 17:10:49 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
Cc: Bartosz Golaszewski <brgl@...ev.pl>, Andy Shevchenko
 <andriy.shevchenko@...ux.intel.com>, 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 gpio-brgl tree with the
 gpio-brgl-fixes tree

Hi Stephen,

On Fri, 10 May 2024 17:08:27 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi Bartosz,
> 
> On Fri, 10 May 2024 08:33:37 +0200 Bartosz Golaszewski <bartosz.golaszewski@...aro.org> wrote:
> >
> > Thanks! I will send the fixes upstream today and then pull v6.9 into
> > my tree before the merge window PR to fix this conflict.  
> 
> Or you could just merge your for-current branch into your for-next
> branch and avoid possible issues with all the rest of v6.9 ...

Or, since it is a pretty simple conflict, just do not merge and just
mention the conflict to Linus in your merge window PR.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped