[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <PH0PR12MB5481DFA1C8135CA639150F4DDC9F9@PH0PR12MB5481.namprd12.prod.outlook.com>
Date: Mon, 22 Nov 2021 05:18:29 +0000
From: Parav Pandit <parav@...dia.com>
To: Stephen Hemminger <stephen@...workplumber.org>
CC: David Ahern <dsahern@...il.com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: RE: [PATCH iproute2] vdpa: align uapi headers
> From: Stephen Hemminger <stephen@...workplumber.org>
> Sent: Monday, November 22, 2021 9:41 AM
>
> On Mon, 22 Nov 2021 02:52:29 +0000
> Parav Pandit <parav@...dia.com> wrote:
>
> > > From: patchwork-bot+netdevbpf@...nel.org <patchwork-
> > > bot+netdevbpf@...nel.org>
> > >
> > > Hello:
> > >
> > > This patch was applied to iproute2/iproute2.git (main) by Stephen
> Hemminger
> > > <stephen@...workplumber.org>:
> > >
> > > 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 <stephen@...workplumber.org>
> > > > ---
> > > > 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=a21458fc35336108acd4b75b4d8e1ef7f7e7d9a
> 1
>
> No worries, Dave will do a header merge.
Ok. thanks.
Powered by blists - more mailing lists