HDMI: 3288/3368: hdcp check firmware pointer.
If firmware is NULL, HDCP is disabled.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

linux os can config sleep mode

Revert "staging: Remove the Android logger driver"

This reverts commit 4f8c75c8d90e9b65ead2eb6d92aaa6f4e43adef8.

Revert "staging: Remove the Android alarm-dev driver"

This reverts commit 013845fd73a5cbefec6e2234d873ea11c320c655.

Revert "staging: Remove logger and alarm-dev from android Makefile"

This reverts commit a290c3e430b1e5c7ddacc3e126e93a008c682cd4.

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

Conflicts:
drivers/base/cpu.c
drivers/misc/Kconfig
drivers/misc/Makefile

dma: pl330: silence a compile warning

On 64 bit systems GCC warns that:

drivers/dma/pl330.c: In function ‘pl330_filter’:
drivers/dma/pl330.c:2317:21: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]

It's harmless and I have casted it away.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit 2f986ec6fa57a5dcf77f19f5f0d44b1f680a100f)

dma: pl330: use dma_addr_t for describing bus addresses

The microcode bus address (pl330_dmac.mcode_bus) is currently a u32,
which fails to compile when building on a system with 64-bit bus
addresses.

This patch uses dma_addr_t to represent the address instead.

Cc: Jassi Brar <jaswinder.singh@linaro.org>
Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
(cherry picked from commit fed8c45727abd273fd74b3e78b35be4929121334)

rk: gcc-wrapper.py ignore psci.c

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rfkill-bt: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

input: gt9xx: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

mmc: rk_sdmmc: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

inv_mpu: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

media: camsys_marvin: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

input: vtl_ts: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

iommu: rockchip-iovmm: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

arm: rockchip: pm: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

arm: rockchip: ddr_freq: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

arm64: cpuinfo: compat task get hwcap from compat_hwcap_str

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

media: rk_camsys: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rk: gcc-wrapper.py ignore compat_binfmt_elf.c:58

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

rkwifi: dhd_config: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

video: rk32_mipi_dsi: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

media: camsys_soc_rk3368: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

thermal: rockchip: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

spi: rockchip: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

spi: rockchip: todos spi-rockchip-test.c

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

RK3368 DDR:Add lcdc type detect for mcu DCF

Signed-off-by: Tang Yun ping <typ@rock-chips.com>

mmc: sdhci-of-arasan: Omit superfluous error messages

sdhci_add_host and sdhci_platfm_init already report failure,
so don't emit error messages when a failure occurs. This prevents
occurences of "deferred" messages when required power supplies
are not ready for operation yet.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

mmc: sdhci-of-arasan: Use signed formatting in error messages

"ret" is a signed int, so use "%d" in format strings instead of "%u".
This prevents cryptic codes in error messages like this:
sdhci-arasan e0101000.sdhci: platform register failed (4294966779)

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

mmc: sdhci-of-arasan: Call OF parsing for MMC

Also check MMC OF properties. The controller supports MMC too.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

mmc: arasan: Add driver for Arasan SDHCI

Add a driver for Arasan's SDHCI controller core.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Rob Herring <rob.herring@calxeda.com> [binding]
Acked-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Chris Ball <chris@printf.net>
Conflicts:
MAINTAINERS

MIPI: Provide a function，get screen type，for frequency conversion.

Signed-off-by: xubilv <xbl@rock-chips.com>

cpufreq: rockchip_big_little: update current policy cpu before cpufreq_cpu_get

Signed-off-by: Xiao Feng <xf@rock-chips.com>

RK3368 GPU version: Rogue L 0.15
1. Fix lock bug in hrtimer.
2. Add USE_KTHREAD to simulate timer.Now open USE_HRTIMER instead of USE_KTHREAD by default.

Signed-off-by: zxl <zhuangxl@rock-chips.com>

rk fb: kfree envp[1], if we not do real switch screen

Signed-off-by: hjc <hjc@rock-chips.com>

rk fb: fix iommu page fault when in video test

Signed-off-by: hjc <hjc@rock-chips.com>

rk3368 lcdc: update win state

Signed-off-by: hjc <hjc@rock-chips.com>

cpufreq: rockchip_big_little: check cpufreq_cpu_get return value

fix panic when cpu up/down

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

HDMI: rk3368: add function for HDCP2.2.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

rockchip: video: fix logo display when switch screen

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

Revert "video: rockchip: logo: copy loader to framebuffer"

This reverts commit a9085919caeb58941c216e63a2bdef458d549f4d.

Revert "video: dts: add disp fullscreen for box logo"

This reverts commit b8667979fa6e142bae9d1731039a250525b7a05a.

rk3368: add the hdmi nlpcm and hbr mode for direct output

Signed-off-by: smj <smj@rock-chips.com>

dts: delete node rockchips,hdmi_audio_source.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

video: rockchip: update display buffer dump

Create a new sys node "/sys/class/graphics/fb0/dump_buf" to dump
display buffer.

Now can support trace multi frames and kernel logo dump.
More info see by "cat /sys/class/graphics/fb0/dump_buf"

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Conflicts:
include/linux/rk_fb.h

delete unused file drivers/video/rockchip/rk_fb.c.rej

Signed-off-by: hjc <hjc@rock-chips.com>

sofia3gr: ion: fix this issue, the reason is ion_import_dma_buf may be invoked concurrently.

<4>[ 3123.242655] WARNING: CPU: 2 PID: 2648 at drivers/staging/android/ion/ion.c:512 ion_handle_add+0xb4/0xc0()
<7>[ 3123.252189] ion_handle_add: buffer already found.
<7>[ 3123.256694] Modules linked in: iwlmvm iwlwifi mac80211 cfg80211 compat
<7>[ 3123.263195] CPU: 2 PID: 2648 Comm: TimedEventQueue Tainted: G        W    3.14.0 #7
<7>[ 3123.270868]  00000000 00000000 9a3efd2c 80faf273 9a3efd6c 9a3efd5c 80935dc9 811d7fd3
<7>[ 3123.278405]  9a3efd88 00000a58 812208a0 00000200 80e128d4 80e128d4 8d4ae00c a8cd8600
<7>[ 3123.286065]  a8cd8094 9a3efd74 80935e0e 00000009 9a3efd6c 811d7fd3 9a3efd88 9a3efd9c
<7>[ 3123.293867] Call Trace:
<7>[ 3123.296159]  [<80faf273>] dump_stack+0x48/0x69
<7>[ 3123.300537]  [<80935dc9>] warn_slowpath_common+0x79/0x90
<7>[ 3123.305913]  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.310694]  [<80e128d4>] ? ion_handle_add+0xb4/0xc0
<7>[ 3123.315703]  [<80935e0e>] warn_slowpath_fmt+0x2e/0x30
<7>[ 3123.320586]  [<80e128d4>] ion_handle_add+0xb4/0xc0
<7>[ 3123.325450]  [<80e144cc>] ion_import_dma_buf+0x8c/0x110
<7>[ 3123.330490]  [<80c517c4>] reg_init+0x364/0x7d0
<7>[ 3123.334975]  [<80993363>] ? futex_wait+0x123/0x210
<7>[ 3123.339607]  [<80992e0e>] ? get_futex_key+0x16e/0x1e0
<7>[ 3123.344692]  [<8099308f>] ? futex_wake+0x5f/0x120
<7>[ 3123.349245]  [<80c51e19>] vpu_service_ioctl+0x1e9/0x500
<7>[ 3123.354508]  [<80994aec>] ? do_futex+0xec/0x8e0
<7>[ 3123.358885]  [<80971080>] ? prepare_to_wait_event+0xc0/0xc0
<7>[ 3123.364503]  [<80c51c30>] ? reg_init+0x7d0/0x7d0
<7>[ 3123.368955]  [<80a22562>] do_vfs_ioctl+0x2d2/0x4c0
<7>[ 3123.373816]  [<80b198ad>] ? inode_has_perm.isra.41+0x2d/0x40
<7>[ 3123.379278]  [<80b199cf>] ? file_has_perm+0x7f/0x90
<7>[ 3123.384217]  [<80b1a5f7>] ? selinux_file_ioctl+0x47/0xf0
<7>[ 3123.389351]  [<80a227a8>] SyS_ioctl+0x58/0x80
<7>[ 3123.393754]  [<80fb45e8>] syscall_call+0x7/0x7
<7>[ 3123.398043]  [<80fb0000>] ? mmc_do_calc_max_discard+0xab/0xe4
<4>[ 3123.404220] ---[ end trace bd195cf65df321ce ]---

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: CMY <cmy@rock-chips.com>

TP: gt9xx: support early suspend&resume

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

arm64: respect mem= for EFI

When booting with EFI, we acquire the EFI memory map after parsing the
early params. This unfortuantely renders the option useless as we call
memblock_enforce_memory_limit (which uses memblock_remove_range behind
the scenes) before we've added any memblocks. We end up removing
nothing, then adding all of memory later when efi_init calls
reserve_regions.

Instead, we can log the limit and apply this later when we do the rest
of the memblock work in memblock_init, which should work regardless of
the presence of EFI. At the same time we may as well move the early
parameter into arm64's mm/init.c, close to arm64_memblock_init.

Any memory which must be mapped (e.g. for use by EFI runtime services)
must be mapped explicitly reather than relying on the linear mapping,
which may be truncated as a result of a mem= option passed on the kernel
command line.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 6083fe74b7bfffc2c7be8c711596608bda0cda6e)
Signed-off-by: Alex Shi <alex.shi@linaro.org>

dts: rk3368 box r88 add power led

rk3368: i2c: add i2c sleep pinctrl

Signed-off-by: David Wu <wdc@rock-chips.com>

   NAND : update dts config for nand.
   nandc0reg are unused now,rknand_base.c will check boot media,if
boot form emmc,nand porbe will not enable clock.

NAND  : add boot media check
    Add boot media check , if boot from EMMC,no need to enable nand clock.

RK3368 GPU version: Rogue L 0.14 Remove 'Instead kmalloc to kzalloc'

Signed-off-by: zxl <zhuangxl@rock-chips.com>

es8316: fix spk no sound.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>

NAND : Fix 3368 dts nand clock config
    hclk_emem_peri need config for nand.

rk3368 lcdc: add support serial RGB888 and RGB888 DUMY output

Signed-off-by: hjc <hjc@rock-chips.com>

video: dts: add disp fullscreen for box logo

video: rockchip: logo: copy loader to framebuffer

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

video: rga: rga use fs_initcall to init early

We want to use rga for loader logo copy, need rga driver init before
lcdc init.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

rk3368 lcdc: enable dither up default

Signed-off-by: hjc <hjc@rock-chips.com>

rk fb: extend output mutex lock in win config

Signed-off-by: hjc <hjc@rock-chips.com>

rk3368 lcdc: fix some hidden trouble maybe lead to abnormal when shutdown

Signed-off-by: hjc <hjc@rock-chips.com>

wifi: support random mac address and save to file, solve compile warning

wifi: support random mac address and save to file

wifi driver: rtl8723bs, rtl8723bs-vq0, rtl8723bu, rtl8812au, modify custom mac addr error problem

rk1000: rk1000 Standby power consumption processing

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Merge branch 'linux-3.10.y' of git://git./linux/kernel/git/stable/linux-stable into linux-linaro-lsk

VCODEC: Disable switch ip when construct iommu table.

Depend on iommu do not operate hardware on create iommu table.
VCODEC disable hardware ip switch.

Switch hardware when create iommu table will break the running
schedule of vpu task queue, and cause the hardware stuck.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>

Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android

 Remove conflictsed drivers/staging/android/logger.c

rk3368: iommu: expose iommu tlb invalidate operation to owner

Signed-off-by: Simon <xxm@rock-chips.com>

rk3368: iommu: delete vop/hevc attach/detach log

Signed-off-by: Simon <xxm@rock-chips.com>

rk3368: iommu: workaround for switch between vpu and hevc

vpu/hevc share the same ahb, when switch vpu and hevc,may cause
iommu error,to avoid this error,skip invalidate iommu tlb when iovmm_map

Signed-off-by: Simon <xxm@rock-chips.com>

dst: rk3368-box.dts amend pwm regulator

dts: 1.add box rk3368 r88 dts; 2.amend 3368 box pwm regulator

tcp: Silence warning: ‘in6’ may be used uninitialized

Initialise in6 to avoid...

In file included from include/net/inetpeer.h:15:0,
                 from include/net/route.h:28,
                 from include/net/inet_hashtables.h:32,
                 from include/net/tcp.h:37,
                 from net/ipv4/tcp.c:275:
net/ipv4/tcp.c: In function ‘tcp_nuke_addr’:
include/net/ipv6.h:417:34: warning: ‘in6’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  return ((ul1[0] ^ ul2[0]) | (ul1[1] ^ ul2[1])) == 0UL;
                                  ^
net/ipv4/tcp.c:3513:19: note: ‘in6’ was declared here
  struct in6_addr *in6;

Signed-off-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

cgroup: Fix build warnings when CGROUP not defined

Commit 57114e95e8 ("cgroup: refactor allow_attach function into common
code") unnecessarily added a dummy definition for
subsys_cgroup_allow_attach when CONFIG_CGROUP is not set, so remove it
to prevent warnings like...

include/linux/cgroup.h:907:18: warning: 'struct cgroup_taskset' declared inside parameter list
           struct cgroup_taskset *tset)
                  ^
include/linux/cgroup.h:907:18: warning: its scope is only this definition or declaration, which is probably not what you want
include/linux/cgroup.h:907:18: warning: 'struct cgroup' declared inside parameter list
  CC      kernel/events/core.o
In file included from kernel/events/core.c:41:0:
include/linux/cgroup.h:907:18: warning: 'struct cgroup_taskset' declared inside parameter list
           struct cgroup_taskset *tset)

Signed-off-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

cpuidle: governor: menu: fix unused function warning

Fixes warning caused by commit df99953c42c6 ("cpuidle: governor:
menu: don't use loadavg")

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

rk3368 lcdc: revert lcdc reset when switch hdmi

Signed-off-by: hjc <hjc@rock-chips.com>

rk3368 lcdc: add gather config for bandwidth

Signed-off-by: hjc <hjc@rock-chips.com>

rk fb: if lcdc is suspend ignore set par and display

Signed-off-by: hjc <hjc@rock-chips.com>

drivers/base: cpu: fix CPU_AUTOPROBE

Use CONFIG_HAVE_CPU_AUTOPROBE instead of CONFIG_ARCH_HAS_CPU_AUTOPROBE

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common

* android-3.10: (23 commits)
  proc: uid_cputime: create uids from kuids
  wakeup: Add last wake up source logging for suspend abort reason.
  selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types
  selinux/nlmsg: add XFRM_MSG_MAPPING
  selinux/nlmsg: add XFRM_MSG_MIGRATE
  selinux/nlmsg: add XFRM_MSG_REPORT
  selinux/nlmsg: add XFRM_MSG_[NEW|GET]SADINFO
  selinux/nlmsg: add XFRM_MSG_GETSPDINFO
  selinux/nlmsg: add XFRM_MSG_NEWSPDINFO
  SELinux: per-command whitelisting of ioctls
  security: lsm_audit: add ioctl specific auditing
  Power: Report suspend times from last_suspend_time
  arm: crypto: Add optimized SHA-256/224
  proc: uid: Adds accounting for the cputimes per uid.
  USB: gadget: android: Integrate f_midi USB MIDI gadget driver part deux
  android: base-cfg: disable ALARM_DEV
  staging: Remove logger and alarm-dev from android Makefile
  staging: Remove the Android alarm-dev driver
  staging: Remove the Android logger driver
  net: ping: fix constness inconsistency in ipv6_chk_addr
  ...

rk3368-box.dts: modify fb display policy to DISPLAY_POLICY_BOX_TEMP.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

proc: uid_cputime: create uids from kuids

Create uids from kuids using from_kuid_munged(),
otherwise we run into following build error and warnings:
--------------------
  CC      drivers/misc/uid_cputime.o
drivers/misc/uid_cputime.c: In function ‘uid_stat_show’:
drivers/misc/uid_cputime.c:90:36: error: incompatible type for argument 1 of ‘find_or_register_uid’
drivers/misc/uid_cputime.c:54:26: note: expected ‘uid_t’ but argument is of type ‘kuid_t’
drivers/misc/uid_cputime.c:94:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘kuid_t’ [-Wformat]
drivers/misc/uid_cputime.c: In function ‘process_notifier’:
drivers/misc/uid_cputime.c:194:6: error: incompatible types when assigning to type ‘uid_t’ from type ‘kuid_t’
make[2]: *** [drivers/misc/uid_cputime.o] Error 1
--------------------

Change-Id: Ifecb98001f7fe2fac74d1ef3e1abd03d43fc9059
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
(cherry picked from commit b0f4decae627cf2d74e6f72c7ecb939c77d48625)

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

configs: Remove duplicate CONFIG_FUNCTION_TRACER

To avoid the following warning when running merge_config.sh with
this config fragment...

./.tmp.config.37TtCkZvtp:92:warning: override: reassigning to symbol FUNCTION_TRACER

Signed-off-by: Jon Medhurst <tixy@linaro.org>

kconfig: Fix warning "‘jump’ may be used uninitialized"

Warning:
In file included from scripts/kconfig/zconf.tab.c:2537:0:
scripts/kconfig/menu.c: In function ‘get_symbol_str’:
scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized]
     jump->offset = strlen(r->s);

Simplifies the test logic because (head && local) means (jump != 0)
and makes GCC happy when checking if the jump pointer was initialized.

Signed-off-by: Peter Kümmel <syntheticpp@gmx.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
(cherry picked from commit 2d560306096739e2251329ab5c16059311a151b0)
Signed-off-by: Jon Medhurst <tixy@linaro.org>

kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len

The struct gstr has a capacity that may differ from the actual string length.

However, a string manipulation in the function search_conf made the assumption
that it is the same, which led to messing up some search results, especially
when the content of the gstr in use had not yet reached at least 63 chars.

Signed-off-by: Martin Walch <walch.martin@web.de>
Acked-by: Wang YanQing <udknight@gmail.com>
Acked-by: Benjamin Poirier <bpoirier@suse.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
(cherry picked from commit 503c823048e81cc85c0e9d8c297cc70203e335e5)
Signed-off-by: Jon Medhurst <tixy@linaro.org>

scripts/sortextable: suppress warning: `relocs_size' may be used uninitialized

In file included from scripts/sortextable.c:194:0:
scripts/sortextable.c: In function `main':
scripts/sortextable.h:176:3: warning: `relocs_size' may be used uninitialized in this function [-Wmaybe-uninitialized]
   memset(relocs, 0, relocs_size);
   ^
scripts/sortextable.h:106:6: note: `relocs_size' was declared here
  int relocs_size;
      ^
In file included from scripts/sortextable.c:192:0:
scripts/sortextable.h:176:3: warning: `relocs_size' may be used uninitialized in this function [-Wmaybe-uninitialized]
   memset(relocs, 0, relocs_size);
   ^
scripts/sortextable.h:106:6: note: `relocs_size' was declared here
  int relocs_size;
      ^

gcc 4.9.1

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Reviewed-by: Jamie Iles <jamie.iles@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 7cbc0ea79da2cbe70d8da9319895f07f872a3190)
Signed-off-by: Jon Medhurst <tixy@linaro.org>

netfilter: nfnetlink_queue: Fix "discards ‘const’ qualifier" warning

nfqnl_zcopy can now modify the 'from' sk_buff, so drop the const
qualifier and fix build warnings like:

net/netfilter/nfnetlink_queue_core.c: In function ‘nfqnl_zcopy’:
net/netfilter/nfnetlink_queue_core.c:264:15: warning: passing argument 1 of ‘skb_orphan_frags’ discards ‘const’ qualifier from pointer target type
  if (unlikely(skb_orphan_frags(from, GFP_ATOMIC))) {

Fixes: c5f0c0e75254 ("core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errors")
Signed-off-by: Jon Medhurst <tixy@linaro.org>

drm/cma: Fix printk formats in drm_gem_cma_describe

This fixes the following warnings when building for arm64...

drivers/gpu/drm/drm_gem_cma_helper.c: In function ‘drm_gem_cma_descr    ibe’:
drivers/gpu/drm/drm_gem_cma_helper.c:273:4: warning: format ‘%Zx’ expects argument of type ‘size_t’, but argument 6 has type ‘dma_addr_t’ [-Wformat=]
    off, cma_obj->paddr, cma_obj->vaddr, obj->size);
    ^
drivers/gpu/drm/drm_gem_cma_helper.c:273:4: warning: format ‘%d’ expects argument of type ‘int’, but argument 8 has type ‘size_t’ [-Wformat=]

Signed-off-by: Jon Medhurst <tixy@linaro.org>

rk fb: add fb disp policy for excessive stage

Signed-off-by: hjc <hjc@rock-chips.com>

rk fb: add mutex lock for switch screen to prevent
       hdmi and cvbs call this function at the same
       time.

Signed-off-by: hjc <hjc@rock-chips.com>

drivers/base: cpu: fix merge problem

In LSK's linux-linaro-lsk-android branch, this merge

bb0dddf6157bc679de9143507375fce3f13fcd00

broke drivers/base/cpu.c

Because this patch appears twice:
197028d  2014-02-08  cpu: add generic support for CPU feature based
module autoloading  [Ard Biesheuvel]
126ef42  2014-02-08  cpu: add generic support for CPU feature based
module autoloading  [Ard Biesheuvel]

And the merge edited the file to the old contents.

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Merge branch 'for-lsk' of git://git.linaro.org/arm/big.LITTLE/mp into linux-linaro-lsk