Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>,
	Networking <netdev@vger.kernel.org>,
	"Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Ido Schimmel <idosch@mellanox.com>
Subject: linux-next: manual merge of the net-next tree with the kspp-gustavo tree
Date: Fri, 1 May 2020 12:55:00 +1000	[thread overview]
Message-ID: <20200501125500.3e7dc414@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 886 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c

between commit:

  3ba225b506a2 ("treewide: Replace zero-length array with flexible-array member")

from the kspp-gustavo tree and commit:

  4780dbdbd957 ("mlxsw: spectrum_span: Replace zero-length array with flexible-array member")

from the net-next tree (and further changes).

I fixed it up (they had the same effect on this file, so I used the
latter) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2020-05-01  2:55 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-01  2:55 Stephen Rothwell [this message]
2020-08-19  1:09 Stephen Rothwell
2021-06-23  2:30 Stephen Rothwell

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=20200501125500.3e7dc414@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=davem@davemloft.net \
    --cc=gustavo@embeddedor.com \
    --cc=idosch@mellanox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --subject='Re: linux-next: manual merge of the net-next tree with the kspp-gustavo tree' \
    /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

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).