Commit Graph

2457 Commits

Author SHA1 Message Date
Huang, Tao
ceaeb4796f add support show process information on printks
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
2015-06-03 17:40:01 +08:00
Huang, Tao
3ca9efa2f8 Merge tag 'lsk-v3.10-15.05-android' into develop-3.10 2015-06-02 11:25:34 +08:00
Alex Shi
54db03197e Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android 2015-05-12 15:18:24 +08:00
Alex Shi
1f8fdf83fe Merge remote-tracking branch 'origin/v3.10/topic/zram' into linux-linaro-lsk
Conflicts:
	mm/Kconfig
	mm/Makefile
2015-05-12 14:55:30 +08:00
Alex Shi
8134585f1c Merge tag 'v3.10.77' into linux-linaro-lsk
This is the 3.10.77 stable release

 Conflicts:
	drivers/video/console/Kconfig
	scripts/kconfig/menu.c
2015-05-12 14:53:40 +08:00
Sergey Senozhatsky
6de155507e lz4: fix compression/decompression signedness mismatch
LZ4 compression and decompression functions require different in
signedness input/output parameters: unsigned char for compression and
signed char for decompression.

Change decompression API to require "(const) unsigned char *".

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Yann Collet <yann.collet.73@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit b34081f1cd)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
2015-05-11 21:00:10 +08:00
Chanho Min
2da344e89c lib: add lz4 compressor module
This patchset is for supporting LZ4 compression and the crypto API using
it.

As shown below, the size of data is a little bit bigger but compressing
speed is faster under the enabled unaligned memory access.  We can use
lz4 de/compression through crypto API as well.  Also, It will be useful
for another potential user of lz4 compression.

lz4 Compression Benchmark:
Compiler: ARM gcc 4.6.4
ARMv7, 1 GHz based board
   Kernel: linux 3.4
   Uncompressed data Size: 101 MB
         Compressed Size  compression Speed
   LZO   72.1MB		  32.1MB/s, 33.0MB/s(UA)
   LZ4   75.1MB		  30.4MB/s, 35.9MB/s(UA)
   LZ4HC 59.8MB		   2.4MB/s,  2.5MB/s(UA)
- UA: Unaligned memory Access support
- Latest patch set for LZO applied

This patch:

Add support for LZ4 compression in the Linux Kernel.  LZ4 Compression APIs
for kernel are based on LZ4 implementation by Yann Collet and were changed
for kernel coding style.

LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
LZ4 source repository : http://code.google.com/p/lz4/
svn revision : r90

Two APIs are added:

lz4_compress() support basic lz4 compression whereas lz4hc_compress()
support high compression or CPU performance get lower but compression
ratio get higher.  Also, we require the pre-allocated working memory with
the defined size and destination buffer must be allocated with the size of
lz4_compressbound.

[akpm@linux-foundation.org: make lz4_compresshcctx() static]
Signed-off-by: Chanho Min <chanho.min@lge.com>
Cc: "Darrick J. Wong" <djwong@us.ibm.com>
Cc: Bob Pearson <rpearson@systemfabricworks.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Herbert Xu <herbert@gondor.hengli.com.au>
Cc: Yann Collet <yann.collet.73@gmail.com>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

(cherry picked from commit c72ac7a1a9)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
2015-05-11 20:58:29 +08:00
Kyungsik Lee
c14a958694 decompressor: add LZ4 decompressor module
Add support for LZ4 decompression in the Linux Kernel.  LZ4 Decompression
APIs for kernel are based on LZ4 implementation by Yann Collet.

Benchmark Results(PATCH v3)
Compiler: Linaro ARM gcc 4.6.2

1. ARMv7, 1.5GHz based board
   Kernel: linux 3.4
   Uncompressed Kernel Size: 14MB
        Compressed Size  Decompression Speed
   LZO  6.7MB            20.1MB/s, 25.2MB/s(UA)
   LZ4  7.3MB            29.1MB/s, 45.6MB/s(UA)

2. ARMv7, 1.7GHz based board
   Kernel: linux 3.7
   Uncompressed Kernel Size: 14MB
        Compressed Size  Decompression Speed
   LZO  6.0MB            34.1MB/s, 52.2MB/s(UA)
   LZ4  6.5MB            86.7MB/s
- UA: Unaligned memory Access support
- Latest patch set for LZO applied

This patch set is for adding support for LZ4-compressed Kernel.  LZ4 is a
very fast lossless compression algorithm and it also features an extremely
fast decoder [1].

But we have five of decompressors already and one question which does
arise, however, is that of where do we stop adding new ones?  This issue
had been discussed and came to the conclusion [2].

Russell King said that we should have:

 - one decompressor which is the fastest
 - one decompressor for the highest compression ratio
 - one popular decompressor (eg conventional gzip)

If we have a replacement one for one of these, then it should do exactly
that: replace it.

The benchmark shows that an 8% increase in image size vs a 66% increase
in decompression speed compared to LZO(which has been known as the
fastest decompressor in the Kernel).  Therefore the "fast but may not be
small" compression title has clearly been taken by LZ4 [3].

[1] http://code.google.com/p/lz4/
[2] http://thread.gmane.org/gmane.linux.kbuild.devel/9157
[3] http://thread.gmane.org/gmane.linux.kbuild.devel/9347

LZ4 homepage: http://fastcompression.blogspot.com/p/lz4.html
LZ4 source repository: http://code.google.com/p/lz4/

Signed-off-by: Kyungsik Lee <kyungsik.lee@lge.com>
Signed-off-by: Yann Collet <yann.collet.73@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit cffb78b0e0)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
2015-05-11 20:56:56 +08:00
mancha security
e60e4dc082 lib: memzero_explicit: use barrier instead of OPTIMIZER_HIDE_VAR
commit 0b053c9518 upstream.

OPTIMIZER_HIDE_VAR(), as defined when using gcc, is insufficient to
ensure protection from dead store optimization.

For the random driver and crypto drivers, calls are emitted ...

  $ gdb vmlinux
  (gdb) disassemble memzero_explicit
  Dump of assembler code for function memzero_explicit:
    0xffffffff813a18b0 <+0>:	push   %rbp
    0xffffffff813a18b1 <+1>:	mov    %rsi,%rdx
    0xffffffff813a18b4 <+4>:	xor    %esi,%esi
    0xffffffff813a18b6 <+6>:	mov    %rsp,%rbp
    0xffffffff813a18b9 <+9>:	callq  0xffffffff813a7120 <memset>
    0xffffffff813a18be <+14>:	pop    %rbp
    0xffffffff813a18bf <+15>:	retq
  End of assembler dump.

  (gdb) disassemble extract_entropy
  [...]
    0xffffffff814a5009 <+313>:	mov    %r12,%rdi
    0xffffffff814a500c <+316>:	mov    $0xa,%esi
    0xffffffff814a5011 <+321>:	callq  0xffffffff813a18b0 <memzero_explicit>
    0xffffffff814a5016 <+326>:	mov    -0x48(%rbp),%rax
  [...]

... but in case in future we might use facilities such as LTO, then
OPTIMIZER_HIDE_VAR() is not sufficient to protect gcc from a possible
eviction of the memset(). We have to use a compiler barrier instead.

Minimal test example when we assume memzero_explicit() would *not* be
a call, but would have been *inlined* instead:

  static inline void memzero_explicit(void *s, size_t count)
  {
    memset(s, 0, count);
    <foo>
  }

  int main(void)
  {
    char buff[20];

    snprintf(buff, sizeof(buff) - 1, "test");
    printf("%s", buff);

    memzero_explicit(buff, sizeof(buff));
    return 0;
  }

With <foo> := OPTIMIZER_HIDE_VAR():

  (gdb) disassemble main
  Dump of assembler code for function main:
  [...]
   0x0000000000400464 <+36>:	callq  0x400410 <printf@plt>
   0x0000000000400469 <+41>:	xor    %eax,%eax
   0x000000000040046b <+43>:	add    $0x28,%rsp
   0x000000000040046f <+47>:	retq
  End of assembler dump.

With <foo> := barrier():

  (gdb) disassemble main
  Dump of assembler code for function main:
  [...]
   0x0000000000400464 <+36>:	callq  0x400410 <printf@plt>
   0x0000000000400469 <+41>:	movq   $0x0,(%rsp)
   0x0000000000400471 <+49>:	movq   $0x0,0x8(%rsp)
   0x000000000040047a <+58>:	movl   $0x0,0x10(%rsp)
   0x0000000000400482 <+66>:	xor    %eax,%eax
   0x0000000000400484 <+68>:	add    $0x28,%rsp
   0x0000000000400488 <+72>:	retq
  End of assembler dump.

As can be seen, movq, movq, movl are being emitted inlined
via memset().

Reference: http://thread.gmane.org/gmane.linux.kernel.cryptoapi/13764/
Fixes: d4c5efdb97 ("random: add and use memzero_explicit() for clearing data")
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: mancha security <mancha1@zoho.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-05-06 21:56:28 +02:00
Huang, Tao
a203a16126 lsk-v3.10-15.03-android release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVFDHrAAoJECTWi3JdVIfQDv0H/iWtOWtchDJTKuzGYxu3vqyy
 YtFIw3cBEDyu4QWY2ZV+QrChZU0mBoRdvaXUS746UQC4tzKgSSMt1axWgXNIM3ow
 FPVFMdcccpEmm4P6cMahJ9jJBOU4/POot+CSSQf2+iI1LRfSYXW1SEVTRN70lD+z
 WiTcT8bTnlkbBAciFOx5d8BCUbhq9EGzsB/1JEemchL/Op15tfqMEfNG77qx+HAB
 to0wRhjWBkPBsuHDsi2XPHPFLu26SsnZj75B4FVEIa2JoY2qxnUhMjKN8cMk+Aql
 KyGNpSe1+jsotanmNUMY2ihSEOA4sDV+Yzsl8d8ZDRdOPLYkXoNh1W/JckG613I=
 =rQEG
 -----END PGP SIGNATURE-----

Merge tag lsk-v3.10-15.03-android

lsk-v3.10-15.03-android release
2015-04-02 09:25:21 +08:00
Alex Shi
910c2c5126 Merge branch 'linaro-android-3.10-lsk' of
git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android
2015-03-16 15:52:47 +08:00
Alex Shi
c577a32260 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Most of cpu feature which hardcode in commit 3868e7f8d4 are
included in compat_hwcap_str[]. We don't need repeat them.

Conflicts:
	arch/arm64/kernel/setup.c
2015-03-10 10:02:32 +08:00
Alex Shi
42f504e28a Merge tag 'v3.10.71' into linux-linaro-lsk
This is the 3.10.71 stable release

Conflicts:
	arch/arm64/kernel/setup.c
2015-03-10 09:48:38 +08:00
Huang, Tao
1ca180425c LSK Android 15.02 v3.10
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJU9ILwAAoJECTWi3JdVIfQcZoH/1U/wwhhYwlevY/Z6LHu6aZ9
 3O9NLpAVIncUPFYoZZ7LfW4HpQoD5Em9TBgYtc/Ej7Ub5MczZPIELRFYlhQIIg/J
 XwFUt6Rd3sQ5uyo2lK0K7jRnRtcD6zxDJfRPpfs+YD9TyF3/bkPjVv+Yf9tp/HTU
 6XcPgNjZUG5Vq1Uzvmx38hMvOOvhGzLwbqgktxN1mawk6sbtt1aY5BaMO85PJXgt
 zkSz8cOvgg5KX1AF0vXnxgwG25Xfp/hqpPAa7rXjUnUmjKUWuS5wYvzw8MB+tYJB
 3AIunsk0JvZofXOn7F7j21gKzOeG6v/xLA5dEdW/v8fmr1ySRLIdIlRnVWftla0=
 =nF/9
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-15.02'

LSK Android 15.02 v3.10

Conflicts:
	drivers/Kconfig
	drivers/regulator/core.c
	include/linux/of.h
2015-03-05 17:11:40 +08:00
Sergey Senozhatsky
92b78405e5 lz4: fix compression/decompression signedness mismatch
LZ4 compression and decompression functions require different in
signedness input/output parameters: unsigned char for compression and
signed char for decompression.

Change decompression API to require "(const) unsigned char *".

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Yann Collet <yann.collet.73@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-03-04 11:31:37 -08:00
Chanho Min
7207f784ce lib: add lz4 compressor module
This patchset is for supporting LZ4 compression and the crypto API using
it.

As shown below, the size of data is a little bit bigger but compressing
speed is faster under the enabled unaligned memory access.  We can use
lz4 de/compression through crypto API as well.  Also, It will be useful
for another potential user of lz4 compression.

lz4 Compression Benchmark:
Compiler: ARM gcc 4.6.4
ARMv7, 1 GHz based board
   Kernel: linux 3.4
   Uncompressed data Size: 101 MB
         Compressed Size  compression Speed
   LZO   72.1MB		  32.1MB/s, 33.0MB/s(UA)
   LZ4   75.1MB		  30.4MB/s, 35.9MB/s(UA)
   LZ4HC 59.8MB		   2.4MB/s,  2.5MB/s(UA)
- UA: Unaligned memory Access support
- Latest patch set for LZO applied

This patch:

Add support for LZ4 compression in the Linux Kernel.  LZ4 Compression APIs
for kernel are based on LZ4 implementation by Yann Collet and were changed
for kernel coding style.

LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
LZ4 source repository : http://code.google.com/p/lz4/
svn revision : r90

Two APIs are added:

lz4_compress() support basic lz4 compression whereas lz4hc_compress()
support high compression or CPU performance get lower but compression
ratio get higher.  Also, we require the pre-allocated working memory with
the defined size and destination buffer must be allocated with the size of
lz4_compressbound.

[akpm@linux-foundation.org: make lz4_compresshcctx() static]
Signed-off-by: Chanho Min <chanho.min@lge.com>
Cc: "Darrick J. Wong" <djwong@us.ibm.com>
Cc: Bob Pearson <rpearson@systemfabricworks.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Herbert Xu <herbert@gondor.hengli.com.au>
Cc: Yann Collet <yann.collet.73@gmail.com>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-03-04 11:30:47 -08:00
Kyungsik Lee
d10a716c35 decompressor: add LZ4 decompressor module
Add support for LZ4 decompression in the Linux Kernel.  LZ4 Decompression
APIs for kernel are based on LZ4 implementation by Yann Collet.

Benchmark Results(PATCH v3)
Compiler: Linaro ARM gcc 4.6.2

1. ARMv7, 1.5GHz based board
   Kernel: linux 3.4
   Uncompressed Kernel Size: 14MB
        Compressed Size  Decompression Speed
   LZO  6.7MB            20.1MB/s, 25.2MB/s(UA)
   LZ4  7.3MB            29.1MB/s, 45.6MB/s(UA)

2. ARMv7, 1.7GHz based board
   Kernel: linux 3.7
   Uncompressed Kernel Size: 14MB
        Compressed Size  Decompression Speed
   LZO  6.0MB            34.1MB/s, 52.2MB/s(UA)
   LZ4  6.5MB            86.7MB/s
- UA: Unaligned memory Access support
- Latest patch set for LZO applied

This patch set is for adding support for LZ4-compressed Kernel.  LZ4 is a
very fast lossless compression algorithm and it also features an extremely
fast decoder [1].

But we have five of decompressors already and one question which does
arise, however, is that of where do we stop adding new ones?  This issue
had been discussed and came to the conclusion [2].

Russell King said that we should have:

 - one decompressor which is the fastest
 - one decompressor for the highest compression ratio
 - one popular decompressor (eg conventional gzip)

If we have a replacement one for one of these, then it should do exactly
that: replace it.

The benchmark shows that an 8% increase in image size vs a 66% increase
in decompression speed compared to LZO(which has been known as the
fastest decompressor in the Kernel).  Therefore the "fast but may not be
small" compression title has clearly been taken by LZ4 [3].

[1] http://code.google.com/p/lz4/
[2] http://thread.gmane.org/gmane.linux.kbuild.devel/9157
[3] http://thread.gmane.org/gmane.linux.kbuild.devel/9347

LZ4 homepage: http://fastcompression.blogspot.com/p/lz4.html
LZ4 source repository: http://code.google.com/p/lz4/

Signed-off-by: Kyungsik Lee <kyungsik.lee@lge.com>
Signed-off-by: Yann Collet <yann.collet.73@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-03-04 11:28:05 -08:00
karl beldan
1c3f3138ea lib/checksum.c: fix build for generic csum_tcpudp_nofold
commit 9ce357795e upstream.

Fixed commit added from64to32 under _#ifndef do_csum_ but used it
under _#ifndef csum_tcpudp_nofold_, breaking some builds (Fengguang's
robot reported TILEGX's). Move from64to32 under the latter.

Fixes: 150ae0e946 ("lib/checksum.c: fix carry in csum_tcpudp_nofold")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-02-11 14:48:17 +08:00
karl beldan
229d02538b lib/checksum.c: fix carry in csum_tcpudp_nofold
commit 150ae0e946 upstream.

The carry from the 64->32bits folding was dropped, e.g with:
saddr=0xFFFFFFFF daddr=0xFF0000FF len=0xFFFF proto=0 sum=1,
csum_tcpudp_nofold returned 0 instead of 1.

Signed-off-by: Karl Beldan <karl.beldan@rivierawaves.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-02-11 14:48:16 +08:00
Huang, Tao
089c13477b LSK Android 15.01 v3.10
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUyRYfAAoJECTWi3JdVIfQd0MH/2Dj1bO551ZDPNG1v4fiDCzc
 cOQ/HD1zZbc3w3GZ7n4DSwvyJiJMR5KZIP/ZRQ5dBYMwQopwTus4BLL0KzcPGLtD
 zljEkSKYaEoPJY7gWGzA+0fxxld0MLTPh7eqovwYt3emiTDRi3yzxxXcUbrG7LeH
 yCYBZd6nN0EpnSvmaiE/PFUzTFyF5QO5vLYugY2/jHUqGi1bZLfi9Y3SY4E/+slT
 vJuH6fU7kJS7c+aQaHctsQ4DvUIONpFiAwDObDjLeQj5OE1xpkWmWY4x6SPYSrWP
 dVoaCsQntmkKxrmvd/KGiofAU/Ajn29JWs5x8c/+jDhJza5Wvv7CQSCSxSOxCYE=
 =dDDy
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-15.01'

LSK Android 15.01 v3.10

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm64/mm/init.c
	drivers/Makefile
	drivers/cpufreq/cpufreq_interactive.c
2015-02-10 16:24:25 +08:00
Mark Brown
72ca3a2d7a Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2015-01-28 17:04:49 +00:00
Mark Brown
1874098820 This is the 3.10.66 stable release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJUx7RYAAoJEDjbvchgkmk+9IYP/0zTadreSMFU4xeCXU28eGR5
 pNR4FIqePtHWg71i2dU3TesIsb59cov0zzDj+RTEAgvvFstrMSi9GpCJmTPrhbm2
 sWyLhbQ/9RrK0KhwspO1aW+qMDywsTCDIxflcOF7IDTm0TvL7J7ljItwf6J3uIeH
 7rIhRHA0ZKCgaKo5NPHKE4q3g6E54jjd0e9VerJHflPt+edUExlZoK+33S6D//7a
 g77pCEXcQ01c4y1tcnou+dYE3WMB+WPbLnXHDAzs679uvvo6D9rQLzFmFfQXLUqN
 p6SLI31eflhHUk47l9G3pVuVo9mHqpYEJVFx10E2Scg2NuZysPZ8DJd1tWaWpTOr
 uK7b7HZR/PpRuUwLsDsJ/BPX9aA8UbSpF614F5bk3xLstagNXYLJiib0mKpI9ccy
 U0Z0UB/ZLF9gWSjeMwyrFiGO6Y8YUxdBQC6yQsZyME9X5OFXYUrFhEBD1aLUldLq
 +cDF+Hx15dUlklPm9BUiN3yztInabbjJSaehl6fTkmlOmGZ/hKQtj4sQxrlq7yTw
 hwXVFLBdCJhG4898NDqqeMFGook70DJShvTq8f33nAfZYJmtD+rjmFk7CVECY2bR
 8YdiveYnCMNlrkgBAYJDBu1ovZu/NbGKZocFMU0aH8l5RMeuLrRpZstUc/D9Ja+/
 SLpv7TFipoFbhCn9Rdwn
 =WPS5
 -----END PGP SIGNATURE-----

Merge tag 'v3.10.66' into linux-linaro-lsk

This is the 3.10.66 stable release
2015-01-28 17:03:48 +00:00
Dan Carpenter
42ddd03e80 decompress_bunzip2: off by one in get_next_block()
commit b5c8afe5be upstream.

"origPtr" is used as an offset into the bd->dbuf[] array.  That array is
allocated in start_bunzip() and has "bd->dbufSize" number of elements so
the test here should be >= instead of >.

Later we check "origPtr" again before using it as an offset so I don't
know if this bug can be triggered in real life.

Fixes: bc22c17e12 ('bzip2/lzma: library support for gzip, bzip2 and lzma decompression')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Alain Knaff <alain@knaff.lu>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-27 07:52:33 -08:00
Mark Brown
a11bc6802c Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2015-01-23 11:33:35 +00:00
Mark Brown
6e24f851be Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into linux-linaro-lsk 2015-01-23 01:32:22 +00:00
Laura Abbott
e4d45c70b7 lib/genalloc.c: add genpool range check function
After allocating an address from a particular genpool, there is no good
way to verify if that address actually belongs to a genpool.  Introduce
addr_in_gen_pool which will return if an address plus size falls
completely within the genpool range.

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Reviewed-by: Olof Johansson <olof@lixom.net>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Riley <davidriley@chromium.org>
Cc: Ritesh Harjain <ritesh.harjani@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 9efb3a421d)
Signed-off-by: Mark Brown <broonie@kernel.org>
2015-01-22 21:51:40 +00:00
Laura Abbott
b4382e715d lib/genalloc.c: add power aligned algorithm
One of the more common algorithms used for allocation is to align the
start address of the allocation to the order of size requested.  Add this
as an algorithm option for genalloc.

Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Olof Johansson <olof@lixom.net>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Riley <davidriley@chromium.org>
Cc: Ritesh Harjain <ritesh.harjani@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 505e3be6c0)
Signed-off-by: Mark Brown <broonie@kernel.org>
2015-01-22 21:51:29 +00:00
Huang, Tao
d03390bfcd LSK Android 14.11 v3.10
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUdvtFAAoJECTWi3JdVIfQn3sH/i7lx5lXGQcZ6HsynmZkqA4J
 9G0kenDhW6Rm0YGetIR3DMTNSkrYbL3rBLPd6Vl+CXx8l1hORlostEBvtMnFK0u/
 B289o6qtW7dc8zzYW5jpwMgC+WNeFD4Gn7/x3bDguYLqMPtbbrr3vzsGaKKmScbJ
 AOyOsZR4TVUi+SUzeCbN8YDW9HSQNhVYrA/qcI6ImASOaKYN4i0stHKMUVoI4HxF
 +e9F40P7Lg8zBM4Ss8X9yYlFxX2EwuKLNrelCvXPo6BBcvjZZM4C4MUvh9c8AyDa
 0LiCgVL3fXb4S+bmJwgRKYm5C9TPpulL3VUDn3fGuVqy9HHfBaC62kc8XX8ciAo=
 =aswn
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-14.11'

LSK Android 14.11 v3.10

Conflicts:
	arch/arm/include/asm/cputype.h
2014-12-05 21:18:34 +08:00
Mark Brown
24a92c1450 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-11-14 18:07:40 +00:00
Mark Brown
8eb52971d4 This is the 3.10.60 stable release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUZjJhAAoJEDjbvchgkmk+HAYP/igDV+sCJC8w4/ht/KVBdxZN
 TAw2boBmoOCXPUBFHQvo5gzOBvtgo4TGf40cqBRrFYevI0vm5RQfWiC6ZBVlc6CS
 cNPDChf32FpARy9Zbwzz/9tUuZik5bildiTW62LgFngmwUgpoJHkdIGsYwHrHui0
 OXbD6kA195cDPnd2MJoU01bBxqNb/L0/yRbvbGsQAFczHIpmjB+zp3KI02L1LHVF
 tX3QmQaCS+ClT60uf4AvF1bYdeIw152r+uQHLqw9eWqDbzK9+kai2jEhmD7GKAS/
 LXJTUYFm5KiGhJAO1SfoWzprW6YFHm/VtaDCkVc9cK/u4a49UKDcr4NAGrYOcysb
 3WYClo6cU9NJRbKeKL3xnKjiDqbnO1LiWOGFsUTfMhMi1GSnHC5YQ0kwr3bfTO3G
 +F786QzEAvohLLsroU1qBZVsT8he1pppEGKjMaa/TRNr2znueTtP936leGglCTKc
 4pMloLc/lOKZttrILLl5j+aHmJLdOr5p5q5DxY6XWV4NcTOVvCcKdacRtMLNl7t9
 mi5xuGrKsb0dnL0qokKc6H+RA4+JSf9lEqYsEXaElx9eSPlrR4zwzIg24endU5GJ
 zv3ozMwcFvBn2FXVUY/k0c1dG4c+vKOjHwUmdJIrFXifMyAg8noqZOTmdQALmdAI
 paCp0KaFvFjIpKUzdy4z
 =q3+t
 -----END PGP SIGNATURE-----

Merge tag 'v3.10.60' into linux-linaro-lsk

This is the 3.10.60 stable release
2014-11-14 17:56:04 +00:00
Jan Kara
8b080e3470 lib/bitmap.c: fix undefined shift in __bitmap_shift_{left|right}()
commit ea5d05b34a upstream.

If __bitmap_shift_left() or __bitmap_shift_right() are asked to shift by
a multiple of BITS_PER_LONG, they will try to shift a long value by
BITS_PER_LONG bits which is undefined.  Change the functions to avoid
the undefined shift.

Coverity id: 1192175
Coverity id: 1192174
Signed-off-by: Jan Kara <jack@suse.cz>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-11-14 08:47:59 -08:00
Daniel Borkmann
25e1465ac3 random: add and use memzero_explicit() for clearing data
commit d4c5efdb97 upstream.

zatimend has reported that in his environment (3.16/gcc4.8.3/corei7)
memset() calls which clear out sensitive data in extract_{buf,entropy,
entropy_user}() in random driver are being optimized away by gcc.

Add a helper memzero_explicit() (similarly as explicit_bzero() variants)
that can be used in such cases where a variable with sensitive data is
being cleared out in the end. Other use cases might also be in crypto
code. [ I have put this into lib/string.c though, as it's always built-in
and doesn't need any dependencies then. ]

Fixes kernel bugzilla: 82041

Reported-by: zatimend@hotmail.co.uk
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-11-14 08:47:55 -08:00
Mark Brown
8b2e026be1 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-10-31 09:45:01 +00:00
Mark Brown
ff114805e1 This is the 3.10.59 stable release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUUmjlAAoJEDjbvchgkmk+HE8P+gIPmhEPSehcBsisY3ltQnZV
 64i4FGj8zFHDQ+8qIavjQl3MVfgH7ncLLsjhkHgNX1MVa8JfQsPiyk7as6hEi9De
 vrpEwBAQzQ+/T4hGL3x9QTl3+40ubqXC2w9QKPp/2q3SetFrzsQe2gsKaM3jSofE
 r2JiINlqcD8rvciX7ow6t0phpNouVejqNWY4f8iKK5T+DkRMx+FeYd3LvctW8QNm
 cY9hEgusTuX0DDiZ3PMuG8Arm2NETv64gXrbdQ47pSO8x7QzBhYhYf4y48ofT8YB
 2S5adLbTzB+CU2Ob2mMi1NE9DEyewtLW8eqK8MuRin+V39ZovYBunCzvBfAHvDu3
 XehrQxnzKGqkGJZA78I7qC7GIbuStsHOl9uSiGf6f+Va9/M7exxv5j+B+uq6Bwkr
 HU8L2qX0G+DUAoTCSRK4qCytl1ZIwAg0AmDcxNb8beG1dH7Ob6dJiXBMe+Bvg3OF
 fNwzo8ovbCfy3oXw7z/Em8LMZju2E+7+m0DnHfdMC6YsXwiFnRjPY+jma+DSY1ew
 QIoy4teACmG9teXW9sWaDdfGZCxcG6FcdCG8+BHXk0QwmtEAhBg+dBc0rqoGrIuA
 XUMSZ+NRQJnQo+8a9LvvhPPIli222Bfpm24C+aFZst8Nzs4vnO0jan54JBYHfWGR
 dsmEqDKLyUW6n6O1kmly
 =rGzc
 -----END PGP SIGNATURE-----

Merge tag 'v3.10.59' into linux-linaro-lsk

This is the 3.10.59 stable release
2014-10-31 09:44:21 +00:00
Willy Tarreau
9689415259 lzo: check for length overrun in variable length encoding.
commit 72cf90124e upstream.

This fix ensures that we never meet an integer overflow while adding
255 while parsing a variable length encoding. It works differently from
commit 206a81c ("lzo: properly check for overruns") because instead of
ensuring that we don't overrun the input, which is tricky to guarantee
due to many assumptions in the code, it simply checks that the cumulated
number of 255 read cannot overflow by bounding this number.

The MAX_255_COUNT is the maximum number of times we can add 255 to a base
count without overflowing an integer. The multiply will overflow when
multiplying 255 by more than MAXINT/255. The sum will overflow earlier
depending on the base count. Since the base count is taken from a u8
and a few bits, it is safe to assume that it will always be lower than
or equal to 2*255, thus we can always prevent any overflow by accepting
two less 255 steps.

This patch also reduces the CPU overhead and actually increases performance
by 1.1% compared to the initial code, while the previous fix costs 3.1%
(measured on x86_64).

The fix needs to be backported to all currently supported stable kernels.

Reported-by: Willem Pinckaers <willem@lekkertech.net>
Cc: "Don A. Bailey" <donb@securitymouse.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-30 09:35:11 -07:00
Willy Tarreau
f7939e1eb8 Revert "lzo: properly check for overruns"
commit af958a38a6 upstream.

This reverts commit 206a81c ("lzo: properly check for overruns").

As analysed by Willem Pinckaers, this fix is still incomplete on
certain rare corner cases, and it is easier to restart from the
original code.

Reported-by: Willem Pinckaers <willem@lekkertech.net>
Cc: "Don A. Bailey" <donb@securitymouse.com>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-30 09:35:11 -07:00
Alex Shi
c482787d23 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-08-08 13:38:04 +08:00
Alex Shi
a4b52d8f38 Merge tag 'v3.10.52' into linux-linaro-lsk
This is the 3.10.52 stable release
2014-08-08 13:34:23 +08:00
Minfei Huang
81513d1471 lib/btree.c: fix leak of whole btree nodes
commit c75b53af2f upstream.

I use btree from 3.14-rc2 in my own module.  When the btree module is
removed, a warning arises:

 kmem_cache_destroy btree_node: Slab cache still has objects
 CPU: 13 PID: 9150 Comm: rmmod Tainted: GF          O 3.14.0-rc2 #1
 Hardware name: Inspur NF5270M3/NF5270M3, BIOS CHEETAH_2.1.3 09/10/2013
 Call Trace:
   dump_stack+0x49/0x5d
   kmem_cache_destroy+0xcf/0xe0
   btree_module_exit+0x10/0x12 [btree]
   SyS_delete_module+0x198/0x1f0
   system_call_fastpath+0x16/0x1b

The cause is that it doesn't release the last btree node, when height = 1
and fill = 1.

[akpm@linux-foundation.org: remove unneeded test of NULL]
Signed-off-by: Minfei Huang <huangminfei@ucloud.cn>
Cc: Joern Engel <joern@logfs.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-08-07 14:30:27 -07:00
黄涛
fcef60e36f LSK v3.10 Android 14.07 release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT2ljqAAoJELSic+t+oim9DKAP+wYv7CYRRQzgQaqpTa2uBJi1
 xjEbS3qz/yWl+xw+Svd9JUGcm4SQg1rvYBd3uEHuqAxqrwaM5BbCHozCiM5ZWRJV
 Q0bR7Ha6RcVXAmNmrs2NaUC7zxIcS1LiBN9FxLPlsv44pxBxgIzQI4ZjN2SMEx5u
 COz3uW+xeVJHMRQ+BYwB/L+NNkgVZdFb71EUrxDiXJr1GWBuhOQ2aYGMRw55QXt5
 WoXUtAWGAQYWfUF6hBvpxEzB060ikOyBGxIdDQkeJdkNK3lD/Ql7M/FMii+H9njt
 FCGtIfV7j/aSzGDY2bW2yGart8N5AvP4T7rAU46+x2Cc9IwTigS8pYltdPv/YrF7
 VYEG4MR2JcYlXl1pCdRHikAOID2tCZS81mhdBFgvXCqSy4OanBOajmu8BGGORFD2
 RFUxALE0Cd+ZQ2JrGhLX+jvUC23FJNoHkcFGn0iE5nv5UJbC9XM7Do1XOe6EDb1r
 waOzjJD06OSAq8kDjExhjzDBhWuDWLdwo6/djsduo0FhI7XmmUs+ebeUne6OTuq5
 duUMXBt48Y4UMbI9v9aSRJVA4OBLfmIlu8ZU8N13BqoN3O4BcWkziUepngc0B+AI
 0ukzozgUjdmuvfmAKsA5OGwpJROtOx2NshsgSDVeFSaOWuqdM3dEE89paruT1qFX
 5NVLVS2Ptn1HuBwHDnW3
 =uFcV
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-14.07' into develop-3.10

LSK v3.10 Android 14.07 release

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	lib/Makefile
2014-08-06 15:34:14 +08:00
Mark Brown
c98536343e Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
	drivers/of/fdt.c
2014-07-24 23:01:03 +01:00
Mark Brown
bcddae4453 Merge remote-tracking branch 'lsk/v3.10/topic/libfdt' into linux-linaro-lsk
Conflicts:
	drivers/of/fdt.c
2014-07-24 22:54:49 +01:00
Mark Salter
fc40eed01c lib: add fdt_empty_tree.c
CONFIG_LIBFDT support does not include fdt_empty_tree.c which is
needed by arm64 EFI stub. Add it to libfdt_files.

Signed-off-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
(cherry picked from commit adaf568784)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-07-24 21:08:48 +01:00
Mark Brown
471dd6b43f Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-07-01 11:20:33 +01:00
Lai Jiangshan
2ada32b01b idr: fix overflow bug during maximum ID calculation at maximum height
commit 3afb69cb55 upstream.

idr_replace() open-codes the logic to calculate the maximum valid ID
given the height of the idr tree; unfortunately, the open-coded logic
doesn't account for the fact that the top layer may have unused slots
and over-shifts the limit to zero when the tree is at its maximum
height.

The following test code shows it fails to replace the value for
id=((1<<27)+42):

  static void test5(void)
  {
        int id;
        DEFINE_IDR(test_idr);
  #define TEST5_START ((1<<27)+42) /* use the highest layer */

        printk(KERN_INFO "Start test5\n");
        id = idr_alloc(&test_idr, (void *)1, TEST5_START, 0, GFP_KERNEL);
        BUG_ON(id != TEST5_START);
        TEST_BUG_ON(idr_replace(&test_idr, (void *)2, TEST5_START) != (void *)1);
        idr_destroy(&test_idr);
        printk(KERN_INFO "End of test5\n");
  }

Fix the bug by using idr_max() which correctly takes into account the
maximum allowed shift.

sub_alloc() shares the same problem and may incorrectly fail with
-EAGAIN; however, this bug doesn't affect correct operation because
idr_get_empty_slot(), which already uses idr_max(), retries with the
increased @id in such cases.

[tj@kernel.org: Updated patch description.]
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-30 20:09:42 -07:00
Greg Kroah-Hartman
feaad01723 lzo: properly check for overruns
commit 206a81c184 upstream.

The lzo decompressor can, if given some really crazy data, possibly
overrun some variable types.  Modify the checking logic to properly
detect overruns before they happen.

Reported-by: "Don A. Bailey" <donb@securitymouse.com>
Tested-by: "Don A. Bailey" <donb@securitymouse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-26 15:12:41 -04:00
Michal Schmidt
83880480db netlink: rate-limit leftover bytes warning and print process name
[ Upstream commit bfc5184b69 ]

Any process is able to send netlink messages with leftover bytes.
Make the warning rate-limited to prevent too much log spam.

The warning is supposed to help find userspace bugs, so print the
triggering command name to implicate the buggy program.

[v2: Use pr_warn_ratelimited instead of printk_ratelimited.]

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-26 15:12:37 -04:00
黄涛
7fe47454f2 lsk-android 14.04
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTWERtAAoJELSic+t+oim9JWYP/0QCExvsT5PIzWueVqblD8Kz
 QlJ/fnFd5xHlVUtF7EJJHlJP6psANlF3ol7UJSofS+V7DFKKU460c5qEqC6XpuXD
 9JdAByrHBfxhOolg0BCSTqSEM7KoZE6LDuEN+ZcDvR5mplHOfTPdtQIjNt2ZQ1A4
 IToz1gAc8yZLzsBSBY7lijLZ3cZAXG3EFwi6imHgdBn2YfK2W/A4qjVTOSdV/ntq
 ISSHDN30EI0dcJJP74pzP5c7S5M9liMDVaEwvzs9+8jYO7TkMqsUz37d2d1u91av
 HyXKMjp07dO4Ym0/iaONv44c3tmVfHrnJDTLZHU2V142KPgpmoplbvouqb9i6DmM
 Euv20a5f8IridDPsIYk1nfmMOP42DVeND2YGgdUFOvSMThE2S5dfhOSgxHeHqXms
 LKXC9ocYYugzDi8rwSCr85K/3rTueR9GUL5730W5ObEq/A8MladQSxtqybroE3uP
 VctJOlrLU2mxfzYU99pybU9CmUz5aZRQP0IUVUgRwK+NxpLhYevhbc22oOR8F/Fu
 qJ9sqNDohHWKH8MCN1NVfsad1CmefQbl5STffQuu1GpRx7elV+/Ri39P6J/0m1UI
 rNbTpGxhHD+0nEMCuxqMS/sknV/vIz4ht9WCAUTcLyUIaFiuihzWnaVo2n3//nDp
 hwg7gOS0O3m0VWxhSh9U
 =+kRa
 -----END PGP SIGNATURE-----

Merge tag 'lsk-android-14.04' into develop-3.10

lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h
2014-04-24 19:04:10 +08:00
黄涛
0ffd56dafe lsk 14.03 Android release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTNAt2AAoJELSic+t+oim9a/8P/Redey2VDMEJ3n4GunW+a8vK
 X+ZjrRnTYItRcVZipuLsl+5KiQURv6k0jVI66ghf4SPmB6bzLkN05ug72WNkdijX
 MiAfT2R58pK+3WmKAtD2q4e64VC1Y4J1L2W68M1LIoMQkzmDYq4s2U1umlJ2BjiO
 /tLrqenOG3Xait/Lkp0OsQMN+Dql7hVL7CbjBK6r7BvXituJc4FZnrkTS/stm7hg
 7/znrNlwnbw1WTye3ZiLIz/rdILmvKGefYelm6/6V/ZHuF0fygxmXQFjP8pbBitW
 4G4PWCVQfrGAgnoEuvEAbvbkdC4ddqV26jjOye9dq67C7yC1LZVtjVsKEAqwweNq
 9+l3yoxZT3beHY9YalhDXbjgDbrpjT6GC8LhCInTwTox3ePxDw5ToS7ncb/csyDA
 8AN6paP3zYvHHv78G1wRJZN99VZe1qQjU/nt04qIhMT/CwFKN1Ld8T21snLRluAZ
 3ML68JxzYf2cD6MVUtXZFD4WJ6TQzaOeqkvmyRA3obQtkrW7uM8wWUL9OYrYD7p7
 M0UECOXmd5ouFjx4tr78QKT9WH/W+qyiq159hFE+OSmFnSXbK/HCFrX4oZqxAJbF
 P1cX/JHgf9ka+RR05dmaWHuTbLC0Ami6aFyJ/dpL9xwH6wegThdEylcD2F7I9+ei
 Y2LIwtS/H9B4aguKeY6x
 =g7zP
 -----END PGP SIGNATURE-----

Merge tag 'lsk-android-14.03' into develop-3.10

lsk 14.03 Android release
2014-04-15 12:51:10 +08:00
Alex Shi
dca382e80b Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-04-15 09:59:04 +08:00