netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Leon Romanovsky <leon@kernel.org>
To: "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>
Cc: "jgg@nvidia.com" <jgg@nvidia.com>,
	"Ertman, David M" <david.m.ertman@intel.com>,
	"linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
	"Ismail, Mustafa" <mustafa.ismail@intel.com>,
	"davem@davemloft.net" <davem@davemloft.net>,
	"kuba@kernel.org" <kuba@kernel.org>,
	"Saleem, Shiraz" <shiraz.saleem@intel.com>,
	"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: Re: [PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07
Date: Wed, 9 Feb 2022 11:50:33 +0200	[thread overview]
Message-ID: <YgOOaZbP/Jvlbt8Q@unreal> (raw)
In-Reply-To: <6591eabecd1959c1744828dad006860520708e9a.camel@intel.com>

On Tue, Feb 08, 2022 at 09:18:36PM +0000, Nguyen, Anthony L wrote:
> On Tue, 2022-02-08 at 13:00 -0400, Jason Gunthorpe wrote:
> > On Mon, Feb 07, 2022 at 03:59:20PM -0800, Tony Nguyen wrote:
> > > This pull request is targeting net-next and rdma-next branches.
> > > RDMA
> > > patches will be sent to RDMA tree following acceptance of this
> > > shared
> > > pull request. These patches have been reviewed by netdev and RDMA
> > > mailing lists[1].
> > > 
> > > Dave adds support for ice driver to provide DSCP QoS mappings to
> > > irdma
> > > driver.
> > > 
> > > [1]
> > > https://lore.kernel.org/netdev/20220202191921.1638-1-shiraz.saleem@intel.com/
> > > The following are changes since commit
> > > e783362eb54cd99b2cac8b3a9aeac942e6f6ac07:
> > >   Linux 5.17-rc1
> > > and are available in the git repository at:
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux iwl-
> > > next
> > 
> > No signed tag?
> > 
> > In future can you send these in the standard form so patchworks will
> > pick them up?
> > 
> > Also please add cover letters so there is something to put in the
> > merge
> 
> I'm still trying to figure out how to do the shared pull requests. I'll
> look into resolving these issues you pointed out for next one.
> 
> One of the things I'm still unsure on is whether the shared pull
> request should contain the netdev and RDMA patches or only the netdev
> ones.

Shared PR intends to solve merge conflicts between various subsystems.

It means that sometimes both netdev and RDMA patches will be there,
however such situation is not common flow. Most of the time, you will
put only netdev changes there, because your driver core logic lays
there and it is there the conflicts will be.

However, there are minimal set of rules which you should follow:
1. This branch should be based on clean -rcX. No back merge of net-next
or rdma-next or other -next.
2. Bisectable
3. Possible to pull as a standlone set without extra patches on top
and it won't break compilation and/or working target which pulled this
branch.

Thanks

> 
> Thanks,
> Tony
> 
> > But PR applied along with the matching two RDMA patches.
> > Thanks,
> > Jason
> 

  reply	other threads:[~2022-02-09  9:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-07 23:59 [PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07 Tony Nguyen
2022-02-07 23:59 ` [PATCH net-next 1/1] ice: add support for DSCP QoS for IDC Tony Nguyen
2022-02-08 17:00 ` [PATCH net-next 0/1] [pull request] iwl-next Intel Wired LAN Driver Updates 2022-02-07 Jason Gunthorpe
2022-02-08 21:18   ` Nguyen, Anthony L
2022-02-09  9:50     ` Leon Romanovsky [this message]
2022-02-09 17:22       ` Nguyen, Anthony L
2022-02-09  4:45 ` Jakub Kicinski

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=YgOOaZbP/Jvlbt8Q@unreal \
    --to=leon@kernel.org \
    --cc=anthony.l.nguyen@intel.com \
    --cc=davem@davemloft.net \
    --cc=david.m.ertman@intel.com \
    --cc=jgg@nvidia.com \
    --cc=kuba@kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=mustafa.ismail@intel.com \
    --cc=netdev@vger.kernel.org \
    --cc=shiraz.saleem@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).