mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	David Miller <davem@davemloft.net>,
	Networking <netdev@vger.kernel.org>
Cc: Leon Romanovsky <leon@kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Huy Nguyen <huyn@mellanox.com>,
	Saeed Mahameed <saeedm@mellanox.com>,
	Raed Salem <raeds@mellanox.com>
Subject: Re: linux-next: manual merge of the mlx5-next tree with the kspp-gustavo tree
Date: Thu, 30 Apr 2020 22:54:33 -0500	[thread overview]
Message-ID: <585d76be-a2e7-1da6-9a9a-f46f14aea222@embeddedor.com> (raw)
In-Reply-To: <32eb40f0-a17b-5a7f-41e0-0f30a507fc31@embeddedor.com>

Stephen,

On 4/30/20 22:30, Gustavo A. R. Silva wrote:

>> This is now a conflict between the net-next and kspp-gustavo trees.
>>
> 
> Thanks for reporting this. I think the best solution, for now, is to remove the
> changes from my tree. I'll do it right away.
> 

I just updated my -next tree. This conflict should be resolved now. :)

Thanks
--
Gustavo

      reply	other threads:[~2020-05-01  4:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-29  2:06 Stephen Rothwell
2020-05-01  3:12 ` Stephen Rothwell
2020-05-01  3:30   ` Gustavo A. R. Silva
2020-05-01  3:54     ` Gustavo A. R. Silva [this message]

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=585d76be-a2e7-1da6-9a9a-f46f14aea222@embeddedor.com \
    --to=gustavo@embeddedor.com \
    --cc=davem@davemloft.net \
    --cc=huyn@mellanox.com \
    --cc=leon@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=raeds@mellanox.com \
    --cc=saeedm@mellanox.com \
    --cc=sfr@canb.auug.org.au \
    /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
all inboxes | Powered by JetHome®