It never ceases to amaze me how both -sdks and -stable modify these sorts of files in conflicting ways! (when neither should really be modfying them at all).
merged. Bruce In message: [linux-yocto][v5.10/standard/cn-sdkv4.18/cn96xx' & v5.10/standard/preempt-rt/cn-sdkv4.18/cn96xx][PATCH] drivers/net/ethernet/marvell/octeontx2/af/rvu.h: fix compile error: duplicate member 'nix_blkaddr' on 20/02/2023 Li Wang wrote: > Signed-off-by: Li Wang <[email protected]> > --- > drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h > b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h > index 313e684855a9..8ba62cf4c145 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h > @@ -277,7 +277,6 @@ struct rvu_pfvf { > u8 lbkid; /* NIX0/1 lbk link ID */ > unsigned long flags; > struct sdp_node_info *sdp_info; > - u8 nix_blkaddr; /* BLKADDR_NIX0/1 assigned to this PF */ > }; > > enum rvu_pfvf_flags { > -- > 2.25.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12176): https://lists.yoctoproject.org/g/linux-yocto/message/12176 Mute This Topic: https://lists.yoctoproject.org/mt/97081816/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
