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
Date: Thu, 19 Oct 2023 16:48:44 +1100 [thread overview]
Message-ID: <20231019164844.4cc37f93@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2516 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-10-19 5:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 5:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-09 4:53 linux-next: manual merge of the bitmap tree with the net-next tree 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=20231019164844.4cc37f93@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aleksander.lobakin@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=paul.greenwalt@intel$(echo .)com \
--cc=pawel.chmielewski@intel$(echo .)com \
--cc=yury.norov@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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