Merge branch 'android-3.4' into android-exynos-3.4
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
media: exynos: gsc: do not allow gsc downscaling by exactly sc_down_max

The Gscaler registers do not have enough bits to represent downscaling
by exactly 16x

Bug: 10946861
Change-Id: Ia3894fa987de2620639bd93f598bfc21d280c503
Signed-off-by: Greg Hackmann <ghackmann@google.com>
media: exynos: gsc: dump registers on mmu fault

Change-Id: I77afcdfed609df6e3cea3f023b489e1e225d3660
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Merge branch 'android-3.4' into android-exynos-3.4
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
ARM: exynos: manta: defconfig: turn off in-kernel lowmem killer

Change-Id: I6021f3fd1781a04b1b8656d56593be471c6eec8a
Signed-off-by: Todd Poynor <toddpoynor@google.com>
ARM: exynos: manta: manta-battery cleanups

Remove code no longer needed by newer Android charger mode.

* Revert "manta: battery: add capacity attribute for charger mode"
  commit 492e2afa6313c2fa23340fc3c5029a6cb40f8628

* Remove supporting stuff no longer needed.

Change-Id: I2a8cadd74b3b3c1333ccdbe43e4cc522a7126c4d
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Merge branch 'android-3.4' into android-exynos-3.4
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4
ion: increase MFC OUTPUT buffer size to support high resolution DRM contents

Bug: 10858740
Change-Id: Id33ff3befebc9b8300c3d21091d38cee935d248f
Signed-off-by: Brijesh Singh <brijesh.s4@samsung.com>
Signed-off-by: JP Abgrall <jpa@google.com>
Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4

* exynos/android-exynos-3.4:
  ion: increase MFC OUTPUT buffer size to support high resolution DRM contents
mali: ARM Mali driver kernel trunk sync [revision 94453 (Jackfruit)]

Change-Id: I0bf26b0e3ba17e682490ba7511406804cbe3226d
Merge remote-tracking branch 'exynos/android-exynos-3.4' into android-exynos-manta-3.4

* exynos/android-exynos-3.4:
  mali: ARM Mali driver kernel trunk sync [revision 94453 (Jackfruit)]

Change-Id: Idc1a257797488ce92052c9768976577f53f037c4
Empty commit
Empty commit
Merge branch 'android-3.4' into android-exynos-3.4

* android-3.4: (813 commits)
  net: wireless: bcmdhd: fixed power consumption issue of P2P.
  net: wireless: bcmdhd: Fix country checking
  Linux 3.4.67
  mm: do not grow the stack vma just because of an overrun on preceding vma
  mm/mmap: check for RLIMIT_AS before unmapping
  drm/radeon: fix hw contexts for SUMO2 asics
  watchdog: ts72xx_wdt: locking bug in ioctl
  parisc: fix interruption handler to respect pagefault_disable()
  KVM: PPC: Book3S HV: Fix typo in saving DSCR
  ext4: fix memory leak in xattr
  vfs: allow O_PATH file descriptors for fstatfs()
  random: run random_int_secret_init() run after all late_initcalls
  ALSA: hda - Add fixup for ASUS N56VZ
  ALSA: snd-usb-usx2y: remove bogus frame checks
  Linux 3.4.66
  ext4: avoid hang when mounting non-journal filesystems with orphan list
  Btrfs: change how we queue blocks for backref checking
  tile: use a more conservative __my_cpu_offset in CONFIG_PREEMPT
  ACPI / IPMI: Fix atomic context requirement of ipmi_msg_handler()
  mm, show_mem: suppress page counts in non-blockable contexts
  ...

Conflicts:
	drivers/dma/pl330.c

Change-Id: I894f7e55b47938cca3d8c5d7106f9a2d2f1a43c9
Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4

* android-exynos-3.4: (813 commits)
  net: wireless: bcmdhd: fixed power consumption issue of P2P.
  net: wireless: bcmdhd: Fix country checking
  Linux 3.4.67
  mm: do not grow the stack vma just because of an overrun on preceding vma
  mm/mmap: check for RLIMIT_AS before unmapping
  drm/radeon: fix hw contexts for SUMO2 asics
  watchdog: ts72xx_wdt: locking bug in ioctl
  parisc: fix interruption handler to respect pagefault_disable()
  KVM: PPC: Book3S HV: Fix typo in saving DSCR
  ext4: fix memory leak in xattr
  vfs: allow O_PATH file descriptors for fstatfs()
  random: run random_int_secret_init() run after all late_initcalls
  ALSA: hda - Add fixup for ASUS N56VZ
  ALSA: snd-usb-usx2y: remove bogus frame checks
  Linux 3.4.66
  ext4: avoid hang when mounting non-journal filesystems with orphan list
  Btrfs: change how we queue blocks for backref checking
  tile: use a more conservative __my_cpu_offset in CONFIG_PREEMPT
  ACPI / IPMI: Fix atomic context requirement of ipmi_msg_handler()
  mm, show_mem: suppress page counts in non-blockable contexts
  ...
mali: Don't trust length of dma_buf sg list

dma_buf returns a size of 4005 pages, but the sg list returned for it
has 4096 pages.

This isn't detected in kbase_jd_umm_map which happily overwrites it's
physical pages array, in this case scribbling 364 bytes beyond the end
of the buffer, possibly corrupting someones else's allocation.

Change-Id: Ia364dcbe001eb4b0aa30fd39ff2cd6d17d5ff7e0
sync: Fix a race condition between release_obj and print_obj

Before this change, a timeline would only be removed from the timeline
list *after* the sync driver had its release_obj() called. However, the
driver's release_obj() may free resources needed by print_obj().

Although the timeline list is locked when print_obj() is called, it is
not locked when release_obj() is called. If one CPU was in print_obj()
when another was in release_obj(), the print_obj() may make unsafe
accesses.

It is not actually necessary to hold the timeline list lock when calling
release_obj() if the call is made after the timeline is unlinked from
the list, since there is no possibility another thread could be in --
or enter -- print_obj() for that timeline.

This change moves the release_obj() call to after the timeline is
unlinked, preventing the above race from occurring.

Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>