[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20211121201111.043f8be9@hermes.local>
Date: Sun, 21 Nov 2021 20:11:11 -0800
From: Stephen Hemminger <stephen@...workplumber.org>
To: Parav Pandit <parav@...dia.com>
Cc: David Ahern <dsahern@...il.com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH iproute2] vdpa: align uapi headers
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=a21458fc35336108acd4b75b4d8e1ef7f7e7d9a1
No worries, Dave will do a header merge.
Powered by blists - more mailing lists