From: Jakub Kicinski <kuba@kernel.org>
To: ljp <ljp@linux.vnet.ibm.com>
Cc: wvoigt@us.ibm.com, netdev@vger.kernel.org,
Linuxppc-dev
<linuxppc-dev-bounces+ljp=linux.ibm.com@lists.ozlabs.org>,
Dany Madden <drt@linux.ibm.com>,
linuxppc-dev@lists.ozlabs.org, davem@davemloft.net
Subject: Re: [PATCH net-next] Revert ibmvnic merge do_change_param_reset into do_reset
Date: Fri, 6 Nov 2020 11:42:08 -0800 [thread overview]
Message-ID: <20201106114208.4b0e8eec@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> (raw)
In-Reply-To: <0ff353cbada91b031d1bbae250a975d5@linux.vnet.ibm.com>
On Fri, 06 Nov 2020 13:30:25 -0600 ljp wrote:
> On 2020-11-06 13:17, Dany Madden wrote:
> > This reverts commit 16b5f5ce351f8709a6b518cc3cbf240c378305bf
> > where it restructures do_reset. There are patches being tested that
> > would require major rework if this is committed first.
> >
> > We will resend this after the other patches have been applied.
>
> I discussed with my manager, and he has agreed not revert this one
> since it is in the net-next tree and will not affect net tree for
> current bug fix patches.
We merge net into net-next periodically (~every week or so) so if you
keep making changes to both branches I will have to deal with the
fallout.
I'm assuming that the resolution for the current conflict which Stephen
Rothwell sent from linux-next is correct. Please confirm.
I will resolve it like he did when Linus pulls from net (hopefully
later today).
But if you know you have more fixes I'd rather revert this, get all the
relevant fixed into net, wait for net to be merged into net-next and
then redo the refactoring.
Hope that makes sense.
next prev parent reply other threads:[~2020-11-06 19:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 19:17 [PATCH net-next] Revert ibmvnic merge do_change_param_reset into do_reset Dany Madden
2020-11-06 19:30 ` ljp
2020-11-06 19:42 ` Jakub Kicinski [this message]
2020-11-06 20:15 ` ljp
2020-11-06 21:02 ` ljp
2020-11-07 1:30 ` Jakub Kicinski
2020-11-07 1:40 ` patchwork-bot+netdevbpf
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=20201106114208.4b0e8eec@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com \
--to=kuba@kernel.org \
--cc=davem@davemloft.net \
--cc=drt@linux.ibm.com \
--cc=linuxppc-dev-bounces+ljp=linux.ibm.com@lists.ozlabs.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=ljp@linux.vnet.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=wvoigt@us.ibm.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).