From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Aug 2018 23:48:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=08b5fa819970c318e58ab638f497633c25971813;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:

 - a new driver for Rohm BU21029 touch controller

 - new bitmap APIs: bitmap_alloc, bitmap_zalloc and bitmap_free

 - updates to Atmel, eeti. pxrc and iforce drivers

 - assorted driver cleanups and fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  MAINTAINERS: Add PhoenixRC Flight Controller Adapter
  Input: do not use WARN() in input_alloc_absinfo()
  Input: mark expected switch fall-throughs
  Input: raydium_i2c_ts - use true and false for boolean values
  Input: evdev - switch to bitmap API
  Input: gpio-keys - switch to bitmap_zalloc()
  Input: elan_i2c_smbus - cast sizeof to int for comparison
  bitmap: Add bitmap_alloc(), bitmap_zalloc() and bitmap_free()
  md: Avoid namespace collision with bitmap API
  dm: Avoid namespace collision with bitmap API
  Input: pm8941-pwrkey - add resin entry
  Input: pm8941-pwrkey - abstract register offsets and event code
  Input: iforce - reorganize joystick configuration lists
  Input: atmel_mxt_ts - move completion to after config crc is updated
  Input: atmel_mxt_ts - don't report zero pressure from T9
  Input: atmel_mxt_ts - zero terminate config firmware file
  Input: atmel_mxt_ts - refactor config update code to add context struct
  Input: atmel_mxt_ts - config CRC may start at T71
  Input: atmel_mxt_ts - remove unnecessary debug on ENOMEM
  Input: atmel_mxt_ts - remove duplicate setup of ABS_MT_PRESSURE
  ...
---

08b5fa819970c318e58ab638f497633c25971813
diff --cc drivers/md/md-bitmap.c
index f983c3fdf204,712a20c4608c..2fc8c113977f
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@@ -2117,10 -2115,10 +2115,10 @@@ int md_bitmap_resize(struct bitmap *bit
  
  	pages = DIV_ROUND_UP(chunks, PAGE_COUNTER_RATIO);
  
 -	new_bp = kzalloc(pages * sizeof(*new_bp), GFP_KERNEL);
 +	new_bp = kcalloc(pages, sizeof(*new_bp), GFP_KERNEL);
  	ret = -ENOMEM;
  	if (!new_bp) {
- 		bitmap_file_unmap(&store);
+ 		md_bitmap_file_unmap(&store);
  		goto err;
  	}