Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d7b63fb authored by Minming Qi's avatar Minming Qi
Browse files

Merge android-4.9.132 (38f2b4a8) into msm-4.9 



* refs/heads/tmp-38f2b4a8:
  Linux 4.9.132
  dm thin metadata: fix __udivdi3 undefined on 32-bit
  ocfs2: fix locking for res->tracking and dlm->tracking_list
  proc: restrict kernel stack dumps to root
  gpiolib: Free the last requested descriptor
  crypto: mxs-dcp - Fix wait logic on chan threads
  crypto: qat - Fix KASAN stack-out-of-bounds bug in adf_probe()
  ALSA: hda/realtek - Cannot adjust speaker's volume on Dell XPS 27 7760
  smb2: fix missing files in root share directory listing
  sysfs: Do not return POSIX ACL xattrs via listxattr
  xen: fix GCC warning and remove duplicate EVTCHN_ROW/EVTCHN_COL usage
  xen: avoid crash in disable_hotplug_cpu
  xen/manage: don't complain about an empty value in control/sysrq node
  cifs: read overflow in is_valid_oplock_break()
  s390/qeth: don't dump past end of unknown HW header
  s390/qeth: use vzalloc for QUERY OAT buffer
  r8169: Clear RTL_FLAG_TASK_*_PENDING when clearing RTL_FLAG_TASK_ENABLED
  arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"
  hexagon: modify ffs() and fls() to return int
  arch/hexagon: fix kernel/dma.c build warning
  dm thin metadata: try to avoid ever aborting transactions
  perf/x86/intel: Add support/quirk for the MISPREDICT bit on Knights Landing CPUs
  net: ena: fix driver when PAGE_SIZE == 64kB
  fs/cifs: suppress a string overflow warning
  dm raid: fix rebuild of specific devices by updating superblock
  drm/nouveau/TBDdevinit: don't fail when PMU/PRE_OS is missing from VBIOS
  net/mlx5: Consider PCI domain in search for next dev
  nvmet-rdma: fix possible bogus dereference under heavy load
  USB: yurex: Check for truncation in yurex_read()
  RDMA/ucma: check fd type in ucma_migrate_id()
  perf probe powerpc: Ignore SyS symbols irrespective of endianness
  perf evsel: Fix potential null pointer dereference in perf_evsel__new_idx()
  HID: hid-saitek: Add device ID for RAT 7 Contagion
  usb: gadget: fotg210-udc: Fix memory leak of fotg210->ep[i]
  HID: add support for Apple Magic Keyboards
  mm: madvise(MADV_DODUMP): allow hugetlbfs pages
  tools/vm/page-types.c: fix "defined but not used" warning
  tools/vm/slabinfo.c: fix sign-compare warning
  mac80211: shorten the IBSS debug messages
  mac80211: don't Tx a deauth frame if the AP forbade Tx
  mac80211: Fix station bandwidth setting after channel switch
  mac80211: fix a race between restart and CSA flows
  cfg80211: fix a type issue in ieee80211_chandef_to_operating_class()
  fs/cifs: don't translate SFM_SLASH (U+F026) to backslash
  net: cadence: Fix a sleep-in-atomic-context bug in macb_halt_tx()
  i2c: uniphier-f: issue STOP only for last message or I2C_M_STOP
  i2c: uniphier: issue STOP only for last message or I2C_M_STOP
  RAID10 BUG_ON in raise_barrier when force is true and conf->barrier is 0
  ARC: atomics: unbork atomic_fetch_##op()
  gpio: Fix crash due to registration race
  cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE
  net: hns: add netif_carrier_off before change speed and duplex
  mac80211: mesh: fix HWMP sequence numbering to follow standard
  gpio: adp5588: Fix sleep-in-atomic-context bug
  mac80211_hwsim: correct use of IEEE80211_VHT_CAP_RXSTBC_X
  mac80211: correct use of IEEE80211_VHT_CAP_RXSTBC_X
  KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function
  mac80211: Run TXQ teardown code before de-registering interfaces
  time: Introduce jiffies64_to_nsecs()
  serial: mvebu-uart: Fix reporting of effective CSIZE to userspace

Change-Id: I9e71ccd261c8dc41893f9e41b42b429245711ec4
Signed-off-by: default avatarMinming Qi <mqi@codeaurora.org>
parents 775e2fbf 38f2b4a8

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 131

SUBLEVEL = 132

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \ 
	"1:	llock   %[orig], [%[ctr]]		\n"		\

	"	" #asm_op " %[val], %[orig], %[i]	\n"		\

	"	scond   %[val], [%[ctr]]		\n"		\

	"						\n"		\

	"	bnz     1b				\n"		\

	: [val]	"=&r"	(val),						\

	  [orig] "=&r" (orig)						\

	: [ctr]	"r"	(&v->counter),					\

arch/arm64/include/asm/jump_label.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


static __always_inline bool arch_static_branch(struct static_key *key, bool branch)

{

	asm goto("1: nop\n\t"

	asm_volatile_goto("1: nop\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align 3\n\t"

		 ".quad 1b, %l[l_yes], %c0\n\t"
@@ -42,7 +42,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran 


static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)

{

	asm goto("1: b %l[l_yes]\n\t"

	asm_volatile_goto("1: b %l[l_yes]\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align 3\n\t"

		 ".quad 1b, %l[l_yes], %c0\n\t"

arch/hexagon/include/asm/bitops.h

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static inline long ffz(int x) 
 * This is defined the same way as ffs.

 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.

 */

static inline long fls(int x)

static inline int fls(int x)

{

	int r;
@@ -232,7 +232,7 @@ static inline long fls(int x) 
 * the libc and compiler builtin ffs routines, therefore

 * differs in spirit from the above ffz (man ffs).

 */

static inline long ffs(int x)

static inline int ffs(int x)

{

	int r;

arch/hexagon/kernel/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void *hexagon_dma_alloc_coherent(struct device *dev, size_t size, 
			panic("Can't create %s() memory pool!", __func__);

		else

			gen_pool_add(coherent_pool,

				pfn_to_virt(max_low_pfn),

				(unsigned long)pfn_to_virt(max_low_pfn),

				hexagon_coherent_pool_size, -1);

	}