linux-next: manual merge of the kselftest tree with the block tree

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  tools/testing/selftests/ublk/kublk.h

between commit:

  584709ad5ce35 ("selftests: ublk: replace assert() with ublk_assert()")

from the block tree and commit:

  3e6ad272bb8b3 ("kselftest/kublk: include message in _Static_assert for C11 compatibility")

from the kselftest 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.

diff --cc tools/testing/selftests/ublk/kublk.h
index ca97deb5e2082,e5eb5f762c1c1..0000000000000
--- a/tools/testing/selftests/ublk/kublk.h
+++ b/tools/testing/selftests/ublk/kublk.h
@@@ -333,10 -217,10 +333,10 @@@ static inline __u64 build_user_data(uns
  		unsigned tgt_data, unsigned q_id, unsigned is_target_io)
  {
  	/* we only have 7 bits to encode q_id */
- 	_Static_assert(UBLK_MAX_QUEUES_SHIFT <= 7);
+ 	_Static_assert(UBLK_MAX_QUEUES_SHIFT <= 7, "UBLK_MAX_QUEUES_SHIFT must be <= 7");
 -	assert(!(tag >> 16) && !(op >> 8) && !(tgt_data >> 16) && !(q_id >> 7));
 +	ublk_assert(!(tag >> 16) && !(op >> 8) && !(tgt_data >> 16) && !(q_id >> 7));
  
 -	return tag | (op << 16) | (tgt_data << 24) |
 +	return tag | ((__u64)op << 16) | ((__u64)tgt_data << 24) |
  		(__u64)q_id << 56 | (__u64)is_target_io << 63;
  }
  

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