Files
Tao Huang 7147b7adb6 Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common
* android-4.4: (252 commits)
  Linux 4.4.194
  net_sched: let qdisc_put() accept NULL pointer
  ARC: export "abort" for modules
  media: technisat-usb2: break out of loop at end of buffer
  floppy: fix usercopy direction
  keys: Fix missing null pointer check in request_key_auth_describe()
  dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
  net: seeq: Fix the function used to release some memory in an error handling path
  tools/power turbostat: fix buffer overrun
  sky2: Disable MSI on yet another ASUS boards (P6Xxxx)
  cifs: Use kzfree() to zero out the password
  cifs: set domainName when a domain-key is used in multiuser
  NFSv2: Fix write regression
  NFSv2: Fix eof handling
  netfilter: nf_conntrack_ftp: Fix debug output
  x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines
  r8152: Set memory to all 0xFFs on failed reg reads
  ARM: 8874/1: mm: only adjust sections of valid mm structures
  Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105
  NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
  ...

Conflicts:
	arch/arm/common/fiq_glue.S
	drivers/clk/rockchip/clk-mmc-phase.c
	drivers/staging/android/fiq_debugger/Kconfig
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/staging/android/fiq_debugger/fiq_debugger.h
	drivers/staging/android/fiq_debugger/fiq_debugger_arm.c
	drivers/staging/android/fiq_debugger/fiq_debugger_arm64.c
	drivers/staging/android/fiq_debugger/fiq_debugger_priv.h

Revert 1850744793 ("ANDROID: fiq_debugger: remove")

Change-Id: I48d451f2fd2fedc7c5849fc5e1f861b7907e333b
2019-10-29 10:52:25 +08:00
..
2019-03-19 14:06:04 +08:00