linux/drivers/staging/android, branch v4.2

Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2015-06-26T22:46:08Z

Pull staging driver updates from Greg KH: "Here's the big, really big, staging tree patches for 4.2-rc1. Loads of stuff in here, almost all just coding style fixes / churn, and a few new drivers as well, one of which I just disabled from the build a few minutes ago due to way too many build warnings. Other than the one "disable this driver" patch, all of these have been in linux-next for quite a while with no reported issues" * tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1163 commits) staging: wilc1000: disable driver due to build warnings Staging: rts5208: fix CHANGE_LINK_STATE value Staging: sm750fb: ddk750_swi2c.c: Insert spaces before parenthesis Staging: sm750fb: ddk750_swi2c.c: Place braces on correct lines Staging: sm750fb: ddk750_swi2c.c: Insert spaces around operators Staging: sm750fb: ddk750_swi2c.c: Replace spaces with tabs Staging: sm750fb: ddk750_swi2c.h: Shorten lines to under 80 characters Staging: sm750fb: ddk750_swi2c.h: Replace spaces with tabs Staging: sm750fb: modedb.h: Shorten lines to under 80 characters Staging: sm750fb: modedb.h: Replace spaces with tabs staging: comedi: addi_apci_3120: rename 'this_board' variables staging: comedi: addi_apci_1516: rename 'this_board' variables staging: comedi: ni_atmio: cleanup ni_getboardtype() staging: comedi: vmk80xx: sanity check context used to get the boardinfo staging: comedi: vmk80xx: rename 'boardinfo' variables staging: comedi: dt3000: rename 'this_board' variables staging: comedi: adv_pci_dio: rename 'this_board' variables staging: comedi: cb_pcidas64: rename 'thisboard' variables staging: comedi: cb_pcidas: rename 'thisboard' variables staging: comedi: me4000: rename 'thisboard' variables ...

mm: oom_kill: clean up victim marking and exiting interfaces

2015-06-25T00:49:43Z

Rename unmark_oom_victim() to exit_oom_victim(). Marking and unmarking are related in functionality, but the interface is not symmetrical at all: one is an internal OOM killer function used during the killing, the other is for an OOM victim to signal its own death on exit later on. This has locking implications, see follow-up changes. While at it, rename mark_tsk_oom_victim() to mark_oom_victim(), which is easier on the eye. Signed-off-by: Johannes Weiner Acked-by: David Rientjes Acked-by: Michal Hocko Cc: Tetsuo Handa Cc: Andrea Arcangeli Cc: Dave Chinner Cc: Vlastimil Babka Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

Staging:Android:ion - Fix for memory leak if ion device registration get failed.

2015-05-24T20:27:13Z

Fix to avoid possible memory leak if the ion device registration get failed.Free the allocated device creation memory before return in case the ion device registration get failed. Signed-off-by: Shailendra Verma Signed-off-by: Greg Kroah-Hartman

staging: android: Add more help description on Kconfig

2015-05-24T20:27:13Z

This patch adds more help description on android Kconfig for - lowmemory killer - Timed gpio (same for timed output) Signed-off-by: Jagan Teki Cc: Greg Kroah-Hartman Cc: Brian Swetland Signed-off-by: Greg Kroah-Hartman

android, lmk: avoid setting TIF_MEMDIE if process has already exited

2015-05-10T13:22:10Z

TIF_MEMDIE should not be set on a process if it does not have a valid ->mm, and this is protected by task_lock(). If TIF_MEMDIE gets set after the mm has detached, and the process fails to exit, then the oom killer will defer forever waiting for it to exit. Make sure that the mm is still valid before setting TIF_MEMDIE by way of mark_tsk_oom_victim(). Cc: "Arve Hjønnevåg" Cc: Riley Andrews Acked-by: Michal Hocko Signed-off-by: David Rientjes Signed-off-by: Greg Kroah-Hartman

drivers/staging: include for modular android tegra_ion code

2015-05-08T07:24:15Z

This file is built off of a tristate Kconfig option and also contains modular function calls so it should explicitly include module.h to avoid compile breakage during header shuffles done in the future. Cc: Greg Kroah-Hartman Cc: "Arve Hj�nnev�g" Cc: Riley Andrews Cc: Stephen Warren Cc: Thierry Reding Cc: Alexandre Courbot Cc: devel@driverdev.osuosl.org Cc: linux-tegra@vger.kernel.org Signed-off-by: Paul Gortmaker Signed-off-by: Greg Kroah-Hartman

staging: android: ion_test: unregister the platform device

2015-05-08T07:24:08Z

The driver has to unregister from platform device when it's unloaded Signed-off-by: Phong Tran Signed-off-by: Greg Kroah-Hartman

staging: android: ion_test: unregister the misc device

2015-05-08T07:24:08Z

Add the remove() method for deregister from misc device when it's unloaded. Signed-off-by: Phong Tran Signed-off-by: Greg Kroah-Hartman

staging: ion: chunk_heap: use pr_debug for heap creation print

2015-05-08T07:24:01Z

We're currently printing to the kernel log at `info' level when we successfully create the chunk heap, but success messages should be done at `debug' level. Fix this. Signed-off-by: Mitchel Humpherys Signed-off-by: Greg Kroah-Hartman

Staging: fixed multiple spelling errors.

2015-05-08T07:23:58Z

Fixed multiple spelling errors. Signed-off-by: Carlos E. Garcia Signed-off-by: Greg Kroah-Hartman