linux-next: manual merge of the kspp tree with the origin tree

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  scripts/coccinelle/api/kmalloc_objs.cocci

between commit:

  bdc5071d7f7bb ("coccinelle: Add kmalloc_objs conversion script")

from the origin tree and commit:

  52d3cfa9bfcd4 ("coccinelle: Add kmalloc_objs conversion script")

from the kspp 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 --combined scripts/coccinelle/api/kmalloc_objs.cocci
index db12b7be7247a,916cc3a661b97..0000000000000
--- a/scripts/coccinelle/api/kmalloc_objs.cocci
+++ b/scripts/coccinelle/api/kmalloc_objs.cocci
@@@ -33,18 -33,15 +33,18 @@@ def alloc_array(name)
  typedef u8, u16, u32, u64;
  typedef __u8, __u16, __u32, __u64;
  typedef uint8_t, uint16_t, uint32_t, uint64_t;
 +typedef uchar, ushort, uint, ulong;
  typedef __le16, __le32, __le64;
  typedef __be16, __be32, __be64;
 -type INTEGRAL = {u8,__u8,uint8_t,char,unsigned char,
 -		 u16,__u16,uint16_t,unsigned short,
 -		 u32,__u32,uint32_t,unsigned int,
 -		 u64,__u64,uint64_t,unsigned long,
 +typedef wchar_t;
 +type INTEGRAL = {u8,__u8,uint8_t,char,unsigned char,uchar,wchar_t,
 +		 u16,__u16,uint16_t,unsigned short,ushort,
 +		 u32,__u32,uint32_t,unsigned int,uint,
 +		 u64,__u64,uint64_t,unsigned long,ulong,
  		 __le16,__le32,__le64,__be16,__be32,__be64};
  char [] STRING;
  INTEGRAL *BYTES;
 +INTEGRAL **BYTES_PTRS;
  type TYPE;
  expression VAR;
  expression GFP;
@@@ -67,10 -64,6 +67,10 @@@ fresh identifier ALLOC_OBJS = script:py
  	BYTES = ALLOC((sizeof(E)), GFP)
  |
  	BYTES = ALLOC((sizeof(TYPE)), GFP)
 +|
 +	BYTES_PTRS = ALLOC((sizeof(E)), GFP)
 +|
 +	BYTES_PTRS = ALLOC((sizeof(TYPE)), GFP)
  |
  	ALLOC((sizeof(void *)), GFP)
  |
@@@ -85,20 -78,12 +85,20 @@@
  	BYTES = ALLOC_ARRAY(COUNT, (sizeof(E)), GFP)
  |
  	BYTES = ALLOC_ARRAY(COUNT, (sizeof(TYPE)), GFP)
 +|
 +	BYTES_PTRS = ALLOC_ARRAY(COUNT, (sizeof(E)), GFP)
 +|
 +	BYTES_PTRS = ALLOC_ARRAY(COUNT, (sizeof(TYPE)), GFP)
  |
  	ALLOC_ARRAY((\(sizeof(STRING)\|sizeof(INTEGRAL)\|sizeof(INTEGRAL *)\)), COUNT, GFP)
  |
  	BYTES = ALLOC_ARRAY((sizeof(E)), COUNT, GFP)
  |
  	BYTES = ALLOC_ARRAY((sizeof(TYPE)), COUNT, GFP)
 +|
 +	BYTES_PTRS = ALLOC_ARRAY((sizeof(E)), COUNT, GFP)
 +|
 +	BYTES_PTRS = ALLOC_ARRAY((sizeof(TYPE)), COUNT, GFP)
  |
  	ALLOC_ARRAY(COUNT, (sizeof(void *)), GFP)
  |

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