From: Vladimir Oltean <olteanv@gmail.com>
To: Tobias Waldekranz <tobias@waldekranz.com>
Cc: davem@davemloft.net, kuba@kernel.org, andrew@lunn.ch,
vivien.didelot@gmail.com, f.fainelli@gmail.com,
netdev@vger.kernel.org, robh+dt@kernel.org,
devicetree@vger.kernel.org
Subject: Re: [PATCH net-next 2/3] net: dsa: Allow default tag protocol to be overridden from DT
Date: Wed, 31 Mar 2021 16:20:13 +0300 [thread overview]
Message-ID: <20210331125753.5kbr4wexmudwmrjc@skbuf> (raw)
In-Reply-To: <20210326125720.fzmqqmeotzbgt4kd@skbuf>
On Fri, Mar 26, 2021 at 02:57:20PM +0200, Vladimir Oltean wrote:
> Hi Tobias,
>
> On Fri, Mar 26, 2021 at 11:56:47AM +0100, Tobias Waldekranz wrote:
> > } else {
> > - dst->tag_ops = dsa_tag_driver_get(tag_protocol);
> > - if (IS_ERR(dst->tag_ops)) {
> > - if (PTR_ERR(dst->tag_ops) == -ENOPROTOOPT)
> > - return -EPROBE_DEFER;
> > - dev_warn(ds->dev, "No tagger for this switch\n");
> > - dp->master = NULL;
> > - return PTR_ERR(dst->tag_ops);
> > - }
> > + dst->tag_ops = tag_ops;
> > }
>
> This will conflict with George's bug fix for 'net', am I right?
> https://patchwork.kernel.org/project/netdevbpf/patch/20210322202650.45776-1-george.mccollister@gmail.com/
>
> Would you mind resending after David merges 'net' into 'net-next'?
>
> This process usually looks like commit d489ded1a369 ("Merge
> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net"). However,
> during this kernel development cycle, I have seen no merge of 'net' into
> 'net-next' since commit 05a59d79793d ("Merge
> git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net"), but that
> comes directly from Linus Torvalds' v5.12-rc2.
>
> Nonetheless, at some point (and sooner rather than later, I think),
> David or Jakub should merge the two trees. I would prefer to do it this
> way because the merge is going to be a bit messy otherwise, and I might
> want to cherry-pick these patches to some trees and it would be nice if
> the history was linear.
>
> Thanks!
Tobias, I think you can safely resend now, I see George's change is in
net-next:
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/tree/net/dsa/dsa2.c#n1084
next prev parent reply other threads:[~2021-03-31 13:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 10:56 [PATCH net-next 0/3] net: dsa: Allow default tag protocol to be overridden from DT Tobias Waldekranz
2021-03-26 10:56 ` [PATCH net-next 1/3] net: dsa: mv88e6xxx: Allow dynamic reconfiguration of tag protocol Tobias Waldekranz
2021-03-28 15:24 ` Andrew Lunn
2021-04-06 9:07 ` Tobias Waldekranz
2021-04-06 13:30 ` Andrew Lunn
2021-03-26 10:56 ` [PATCH net-next 2/3] net: dsa: Allow default tag protocol to be overridden from DT Tobias Waldekranz
2021-03-26 12:57 ` Vladimir Oltean
2021-03-26 13:33 ` Tobias Waldekranz
2021-03-31 13:20 ` Vladimir Oltean [this message]
2021-03-28 15:52 ` Andrew Lunn
2021-03-28 21:53 ` Vladimir Oltean
2021-03-28 22:04 ` Andrew Lunn
2021-03-29 7:15 ` Vladimir Oltean
2021-03-26 10:56 ` [PATCH net-next 3/3] dt-bindings: net: dsa: Document dsa,tag-protocol property Tobias Waldekranz
2021-03-27 18:13 ` Rob Herring
2021-04-06 9:52 ` Tobias Waldekranz
2021-04-06 13:30 ` Andrew Lunn
2021-04-07 23:34 ` Vladimir Oltean
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=20210331125753.5kbr4wexmudwmrjc@skbuf \
--to=olteanv@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=tobias@waldekranz.com \
--cc=vivien.didelot@gmail.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).