Hello Ilpo,

On Thu, Feb 02, 2023 at 02:09:38PM +0200, Ilpo Järvinen wrote:
> On Thu, 2 Feb 2023, Uwe Kleine-König wrote:
> > On Thu, Feb 02, 2023 at 01:26:08PM +0200, Ilpo Järvinen wrote:
> > > I don't know if Fixes tag is appropriate here. This fixes the mismerge 
> > > yes, however, the removed line itself seems harmless so there's no real 
> > > problem to fix.
> > 
> > It might make a difference if LSR_SAVE_FLAGS != p->lsr_save_mask.
> 
> But currently lsr_save_mask always has at least LSR_SAVE_FLAGS bits so 
> that OR is no-op.

Oh indeed. So it's even more harmless than I thought. Thanks.

@gregkh: I don't feel strong about the Fixes line, drop it if you prefer
to not have it.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |