linux-next: manual merge of the bitmap tree with the net-next tree

[Stephen Rothwell]

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 macros")

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.

-- 
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
  
  #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_size,
 +					  unsigned long *addr)
 +{
 +	int i;
 +
 +	for (i = 0; i < array_size; i++)
 +		linkmode_set_bit(array[i], addr);
 +}
 +
  #include <linux/ethtool.h>
  #include <uapi/linux/ethtool.h>
  
@@@ -53,25 -38,20 +50,10 @@@ static inline int linkmode_andnot(unsig
  	return bitmap_andnot(dst, src1, src2,  __ETHTOOL_LINK_MODE_MASK_NBITS);
  }
  
- static inline void linkmode_clear_bit(int nr, volatile unsigned long *addr)
- {
- 	__clear_bit(nr, addr);
- }
- 
- 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);
- }
- 
- 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
  
 -static inline void linkmode_set_bit_array(const int *array, int array_size,
 -					  unsigned long *addr)
 -{
 -	int i;
 -
 -	for (i = 0; i < array_size; i++)
 -		linkmode_set_bit(array[i], addr);
 -}
 -
  static inline int linkmode_equal(const unsigned long *src1,
  				 const unsigned long *src2)
  {

Attachment: pgpOt22aPJ8Xz.pgp
Description: OpenPGP digital signature