On Mon, 3 May 2021 15:39:19 -0500
"Bajjuri, Praneeth" <praneeth@xxxxxx> wrote:
> On 4/19/2021 5:47 PM, Steven Rostedt wrote:
> > On Tue, Apr 20, 2021,ycollette.nospam@xxxxxxx wrote:
> >> net/xfrm/xfrm_state.c: In function 'xfrm_state_init':
> >> ./include/linux/seqlock.h:178:36: error: initialization of 'seqcount_spinlock_t *' {aka 'struct seqcount_spinlock *'} from incompatible pointer type 'seqcount_t *' {aka 'struct seqcount *'} [-Werror=incompatible-pointer-types]
> >> 178 | seqcount_##lockname##_t *____s = (s); \
> >> | ^
> > ...
> >> net/xfrm/xfrm_state.c:2666:2: note: in expansion of macro 'seqcount_spinlock_init'
> >> 2666 | seqcount_spinlock_init(&net->xfrm.xfrm_state_hash_generation,
> >> | ^~~~~~~~~~~~~~~~~~~~~~
> > There is a rebase error at:
> >
> > 247560698349 ("Merge tag 'v5.10.30' into v5.10-rt")
> >
> > Cherry-pick mainline's commit:
> >
> > bc8e0adff343 ("net: xfrm: Use sequence counter with associated spinlock")
>
> Thanks for this fix, Cherry-pick resolved rt stable integration issue
> that i was seeing.
>
> Is this fix going to be posted for v5.10-rt too ?
>
> >
> > and your compilation issue will be fixed.
Yes, I'm pulling it in now (sorry for the delay).
For some reason, Yann's email never made it into my INBOX :-/
But cherry picking that commit appears to do the job. I'll pull that in,
and then start bringing 5.10 to the latest release.
-- Steve
