[GIT PULL] staging: Android updates

[GIT PULL] staging: Android updates

[John Stultz]

Hi Greg, 
	Just wanted to send along some Android updates to the staging-next tree
so they can be queued for 3.4. I've pulled these from the
common/android-3.3 branch, and made only some minor changes to keep
everything in the staging dir and to avoid compile issues on x86.

The patches can be browsed over here:
http://git.linaro.org/gitweb?p=people/jstultz/android-dev.git;a=shortlog;h=refs/heads/dev/android-staging-updates

thanks
-john


The following changes since commit 1ec41a31fb695682cab7fc7c1f6ced84d188b6f9:

  staging: ozwpan: remove debug allocator (2012-03-02 16:51:09 -0800)

are available in the git repository at:
  git://git.linaro.org/people/jstultz/android-dev.git dev/android-staging-updates

Colin Cross (11):
      android: binder: fix warning
      android: ram_console: move footer strings
      android: ram_console: drop early buffer support
      android: ram_console: drop verbose ram_console support
      android: ram_console: split out persistent ram
      android: persistent_ram: refactor ecc support
      android: persistent_ram: handle reserving and mapping memory
      android: persistent_ram: make persistent_ram_write atomic
      android: persistent_ram: add notrace to persistent_ram_write
      android: persistent_trace: ftrace into persistent_ram
      android: staging: ram_console: fix crash in ram_console_late_init

Dima Zavin (1):
      android: ram_console: set CON_ANYTIME console flag

John Stultz (1):
      android: lowmemorykiller: Fix warning on 64bit

Nick Kralevich (1):
      android: ram_console: honor dmesg_restrict

 drivers/staging/android/Kconfig            |   70 +---
 drivers/staging/android/Makefile           |    4 +
 drivers/staging/android/binder.c           |    2 +-
 drivers/staging/android/lowmemorykiller.c  |    2 +-
 drivers/staging/android/persistent_ram.c   |  470 ++++++++++++++++++++++++++++
 drivers/staging/android/persistent_ram.h   |   78 +++++
 drivers/staging/android/ram_console.c      |  412 +++++--------------------
 drivers/staging/android/trace_persistent.c |  242 ++++++++++++++
 8 files changed, 888 insertions(+), 392 deletions(-)
 create mode 100644 drivers/staging/android/persistent_ram.c
 create mode 100644 drivers/staging/android/persistent_ram.h
 create mode 100644 drivers/staging/android/trace_persistent.c

Re: [GIT PULL] staging: Android updates

[Greg KH]

On Wed, Mar 07, 2012 at 01:34:06PM -0800, John Stultz wrote:
> Hi Greg, 
> 	Just wanted to send along some Android updates to the staging-next tree
> so they can be queued for 3.4. I've pulled these from the
> common/android-3.3 branch, and made only some minor changes to keep
> everything in the staging dir and to avoid compile issues on x86.

Ick, I really don't like git pull requests for staging tree stuff at the
moment.  Besides, you didn't sign your pull request, so I couldn't take
it anyway :)

Can you just send these in email using 'git send-email' instead?  That
works with my workflow very easily.

This is especially going to be an issue as some of these patches
conflict with others I just applied in the past 24 hours, and I can fix
them up by hand easier using individual patches in email.

thanks,

greg k-h

Re: [GIT PULL] staging: Android updates

[Daniel Walker]

On 03/07/2012 01:34 PM, John Stultz wrote:
>        android: ram_console: move footer strings
>        android: ram_console: drop early buffer support
>        android: ram_console: drop verbose ram_console support
>        android: ram_console: split out persistent ram

What are the differences between mtdoops/ramoops and ram_console? My 
research showed they had different ways of saving the memory, but didn't 
very similar things.

Daniel

Re: [GIT PULL] staging: Android updates

[John Stultz]

On Wed, 2012-03-07 at 13:42 -0800, Greg KH wrote:
> On Wed, Mar 07, 2012 at 01:34:06PM -0800, John Stultz wrote:
> > Hi Greg, 
> > 	Just wanted to send along some Android updates to the staging-next tree
> > so they can be queued for 3.4. I've pulled these from the
> > common/android-3.3 branch, and made only some minor changes to keep
> > everything in the staging dir and to avoid compile issues on x86.
> 
> Ick, I really don't like git pull requests for staging tree stuff at the
> moment.  Besides, you didn't sign your pull request, so I couldn't take
> it anyway :)
> 
> Can you just send these in email using 'git send-email' instead?  That
> works with my workflow very easily.

Sure. I can use git-send-email.

thanks
-john