Re: linux-next: build failure after merge of the staging tree

[Stephen Rothwell]

Hi Greg,

On Mon, 7 Dec 2020 10:26:06 +0100 Greg KH <greg@xxxxxxxxx> wrote:
>
> > diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c
> > index 10a3fd29362b..0f6b512a5c37 100644
> > --- a/drivers/iio/trigger/iio-trig-sysfs.c
> > +++ b/drivers/iio/trigger/iio-trig-sysfs.c
> > @@ -160,8 +160,7 @@ static int iio_sysfs_trigger_probe(int id)
> >  	t->trig->dev.parent = &iio_sysfs_trig_dev;
> >  	iio_trigger_set_drvdata(t->trig, t);
> >  
> > -	init_irq_work(&t->work, iio_sysfs_trigger_work);
> > -	atomic_set(&t->work.flags, IRQ_WORK_HARD_IRQ);
> > +	t->work = IRQ_WORK_INIT_HARD(iio_sysfs_trigger_work);
> >  
> >  	ret = iio_trigger_register(t->trig);
> >  	if (ret)
> > -- 
> > 2.29.2  
> 
> Is this patch "safe" to take now, if the tip tree isn't part of my tree?

Unfortunately not, as IRQ_WORK_INIT_HARD() is introduced by the tip tree
commit.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpmpqlGggO_8.pgp
Description: OpenPGP digital signature