| Message ID | 20210412024415.30676-1-zhukeqian1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vfio/iommu_type1: Remove unused pinned_page_dirty_scope in vfio_iommu | expand |
On Mon, 12 Apr 2021 10:44:15 +0800 Keqian Zhu <zhukeqian1@huawei.com> wrote: > pinned_page_dirty_scope is optimized out by commit 010321565a7d > ("vfio/iommu_type1: Mantain a counter for non_pinned_groups"), > but appears again due to some issues during merging branches. > We can safely remove it here. > > Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com> > --- > > However, I'm not clear about the root problem. Is there a bug in git? Strange, clearly I broke something in merge commit 76adb20f924f, but it's not evident to me how that line reappeared. Thanks for spotting it, I'll queue this for v5.13. Thanks, Alex > --- > drivers/vfio/vfio_iommu_type1.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index 45cbfd4879a5..4d1f10a33d74 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -77,7 +77,6 @@ struct vfio_iommu { > bool v2; > bool nesting; > bool dirty_page_tracking; > - bool pinned_page_dirty_scope; > bool container_open; > }; >
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 45cbfd4879a5..4d1f10a33d74 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -77,7 +77,6 @@ struct vfio_iommu { bool v2; bool nesting; bool dirty_page_tracking; - bool pinned_page_dirty_scope; bool container_open; };
pinned_page_dirty_scope is optimized out by commit 010321565a7d ("vfio/iommu_type1: Mantain a counter for non_pinned_groups"), but appears again due to some issues during merging branches. We can safely remove it here. Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com> --- However, I'm not clear about the root problem. Is there a bug in git? --- drivers/vfio/vfio_iommu_type1.c | 1 - 1 file changed, 1 deletion(-)