From: Stephen Hemminger <stephen@networkplumber.org>
To: Parav Pandit <parav@nvidia.com>
Cc: David Ahern <dsahern@gmail.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: [PATCH iproute2] vdpa: align uapi headers
Date: Sun, 21 Nov 2021 20:11:11 -0800 [thread overview]
Message-ID: <20211121201111.043f8be9@hermes.local> (raw)
In-Reply-To: <PH0PR12MB54816468137C264E45CCE9C6DC9F9@PH0PR12MB5481.namprd12.prod.outlook.com>
On Mon, 22 Nov 2021 02:52:29 +0000
Parav Pandit <parav@nvidia.com> wrote:
> > From: patchwork-bot+netdevbpf@kernel.org <patchwork-
> > bot+netdevbpf@kernel.org>
> >
> > Hello:
> >
> > This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger
> > <stephen@networkplumber.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@networkplumber.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.
next prev parent reply other threads:[~2021-11-22 4:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-06 6:41 [PATCH net-next iproute2] vdpa: Remove duplicate vdpa UAPI header file Parav Pandit
2021-11-18 4:21 ` Parav Pandit
2021-11-18 16:18 ` Stephen Hemminger
2021-11-18 17:51 ` David Ahern
2021-11-18 18:00 ` [PATCH iproute2] vdpa: align uapi headers Stephen Hemminger
2021-11-18 18:10 ` patchwork-bot+netdevbpf
2021-11-22 2:52 ` Parav Pandit
2021-11-22 4:11 ` Stephen Hemminger [this message]
2021-11-22 5:18 ` Parav Pandit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211121201111.043f8be9@hermes.local \
--to=stephen@networkplumber.org \
--cc=dsahern@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=parav@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.