On Thu, Mar 14, 2024 at 11:25:28PM +0100, Helge Deller wrote:
> On 3/14/24 23:19, Kent Overstreet wrote:
> > On Thu, Mar 14, 2024 at 10:34:59PM +0100, Helge Deller wrote:
> > > On 3/14/24 20:08, Kent Overstreet wrote:
> > > > On Thu, Mar 14, 2024 at 01:57:51PM +0100, Helge Deller wrote:
> > > > > (fixed email subject)
> > > > > On 3/14/24 10:46, Kent Overstreet wrote:
> > > > > > On Thu, Mar 14, 2024 at 10:41:12AM +0100, Helge Deller wrote:
> > > > > > > Dear Greg & stable team,
> > > > > > >
> > > > > > > could you please queue up the patch below for the stable-6.7 kernel?
> > > > > > > This is upstream commit:
> > > > > > > eba38cc7578bef94865341c73608bdf49193a51d
> > > > > > >
> > > > > > > Thanks,
> > > > > > > Helge
> > > > > >
> > > > > > I've already sent Greg a pull request with this patch - _twice_.
> > > > >
> > > > > OIC.
> > > > > You and Greg had some email exchange :-)
> > > > >
> > > > > Greg, I'm seeing kernel build failures in debian with kernel 6.7.9
> > > > > and the patch mentioned above isn't sufficient.
> > > > >
> > > > > Would you please instead pull in those two upstream commits (in this order) to fix it:
> > > > > 44fd13a4c68e87953ccd827e764fa566ddcbbcf5 ("bcachefs: Fixes for rust bindgen")
> > > >
> > > > You'll have to explain what this patch fixes, it shouldn't be doing
> > > > anything when building in the kernel (yet; it will when we've pulled our
> > > > Rust code into the kernel).
> > >
> > > Right. It doesn't actually do anything in the kernel (which is good), but
> > > it's logically before patch eba38cc7578bef94865341c73608bdf49193a51d
> > > and is required so that eba38cc7578bef94865341c73608bdf49193a51d cleanly
> > > applies.
> >
> > yeah I just fixed the merge conflict
>
> Where did you fixed it?
> Those two patches are already upstream, and ideally should go downstream as-is...
https://evilpiepirate.org/git/bcachefs.git/log/?h=bcachefs-for-v6.7
