Subject: Re: [PATCH iproute2] vdpa: align uapi headers

From: Stephen Hemminger <[email-masked]>
Date: Sun, 21 Nov 2021 20:11:11 -0800

On Mon, 22 Nov 2021 02:52:29 +0000
Parav Pandit <[email-masked]> wrote:

> > From: [email-masked] <patchwork-  
> > [email-masked]>  
> > 
> > Hello:
> > 
> > This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger
> > <[email-masked]>:
> > 
> > On Thu, 18 Nov 2021 10:00:00 -0800 you wrote:  
> > > Update vdpa headers based on 5.16.0-rc1 and remove redundant copy.
> > >
> > > Signed-off-by: Stephen Hemminger <[email-masked]>
> > > ---
> > >  include/uapi/linux/vdpa.h            | 47 ----------------------------  
> 
> This will conflict with commit [1] in iproute2-next branch.
> [1] https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?h=master&id=a21458fc35336108acd4b75b4d8e1ef7f7e7d9a1

No worries, Dave will do a header merge.