Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Date:   Thu, 19 Oct 2023 16:48:44 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Yury Norov <yury.norov@gmail.com>,
        David Miller <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     Networking <netdev@vger.kernel.org>,
        Alexander Lobakin <aleksander.lobakin@intel.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Paul Greenwalt <paul.greenwalt@intel.com>,
        Pawel Chmielewski <pawel.chmielewski@intel.com>
Subject: linux-next: manual merge of the bitmap tree with the net-next tree
Message-ID: <20231019164844.4cc37f93@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/iYTkWDP_1_tS6QBLU_WRv4Z";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/iYTkWDP_1_tS6QBLU_WRv4Z
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  include/linux/linkmode.h

between commit:

  26c5334d344d ("ethtool: Add forced speed to supported link modes maps")

from the net-next tree and commit:

  f849608560af ("linkmode: convert linkmode_{test,set,clear,mod}_bit() to m=
acros")

from the bitmap tree.

I fixed it up (see below) 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.

--=20
Cheers,
Stephen Rothwell

diff --cc include/linux/linkmode.h
index cd38f89553e6,f231e2edbfa5..000000000000
--- a/include/linux/linkmode.h
+++ b/include/linux/linkmode.h
@@@ -2,21 -2,6 +2,18 @@@
  #define __LINKMODE_H
 =20
  #include <linux/bitmap.h>
 +
- static inline void linkmode_set_bit(int nr, volatile unsigned long *addr)
- {
- 	__set_bit(nr, addr);
- }
++#define linkmode_set_bit	__set_bit
 +
 +static inline void linkmode_set_bit_array(const int *array, int array_siz=
e,
 +					  unsigned long *addr)
 +{
 +	int i;
 +
 +	for (i =3D 0; i < array_size; i++)
 +		linkmode_set_bit(array[i], addr);
 +}
 +
  #include <linux/ethtool.h>
  #include <uapi/linux/ethtool.h>
 =20
@@@ -53,25 -38,20 +50,10 @@@ static inline int linkmode_andnot(unsig
  	return bitmap_andnot(dst, src1, src2,  __ETHTOOL_LINK_MODE_MASK_NBITS);
  }
 =20
- static inline void linkmode_clear_bit(int nr, volatile unsigned long *add=
r)
- {
- 	__clear_bit(nr, addr);
- }
-=20
- static inline void linkmode_mod_bit(int nr, volatile unsigned long *addr,
- 				    int set)
- {
- 	if (set)
- 		linkmode_set_bit(nr, addr);
- 	else
- 		linkmode_clear_bit(nr, addr);
- }
-=20
- static inline int linkmode_test_bit(int nr, const volatile unsigned long =
*addr)
- {
- 	return test_bit(nr, addr);
- }
+ #define linkmode_test_bit	test_bit
 -#define linkmode_set_bit	__set_bit
+ #define linkmode_clear_bit	__clear_bit
+ #define linkmode_mod_bit	__assign_bit
 =20
 -static inline void linkmode_set_bit_array(const int *array, int array_siz=
e,
 -					  unsigned long *addr)
 -{
 -	int i;
 -
 -	for (i =3D 0; i < array_size; i++)
 -		linkmode_set_bit(array[i], addr);
 -}
 -
  static inline int linkmode_equal(const unsigned long *src1,
  				 const unsigned long *src2)
  {

--Sig_/iYTkWDP_1_tS6QBLU_WRv4Z
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUwwzwACgkQAVBC80lX
0Gw8dQf/ckBlyqp0x9E8fPVAlHEGxWz7oIixRXFmyKVZtQX+FBMrvd+8ZgWRtjvk
UjnR7VBJnwW5dPik7yaw+9dkdwZX7xFx8ALRAt24bMdf3idw2nD3/djdr+EjnEz7
rlAajFjWOFfCuvbx3DAMwZT5yWJkdCzy5qxhhmNMHpku0oQv2E13W+bgb/rGFQbb
kyXJwRITcfuoVkLZDv3dfcwueSFu29kty8hBP2dej037TgBSPaG2kej62HWyKH4s
gZEATqGiQQgKvwRHLAmGk7B08TZBqrjieO/mwF+V7sGvaf+UF8R6BP/+UpmrLx8V
mXGwoP4E023L9ekDlPpSK8Z2DeK+FQ==
=C7Mx
-----END PGP SIGNATURE-----

--Sig_/iYTkWDP_1_tS6QBLU_WRv4Z--