bugfix CONFIG_CONSOLE_EARLYSUSPEND for 3.0 kernel
drivers/staging/Kconfig: uncomment source "drivers/staging/omaprpc/Kconfig"
minor changes
Revert "android: lowmemorykiller: modify return values to avoid extra calls"

This reverts commit d0b82d54b670e2da6a8735a2bc476340d64d51ce.
android/lowmemorykiller: Wait for memory to be freed

The memory reclaim code needs to give time to the system to
return the memory from a killed process otherwise the memory
reclaim code could run continuously, in multiple threads,
which could starve both the watchdog thread and the thread
which is responsible for returning the memory from the
killed process.

Change-Id: Ieded4bfe038ca936247fa4b638070e979b02eaa1
CRs-fixed: 447740
Signed-off-by: Liam Mark <lmark@codeaurora.org>
modified for Mako from CAF reference

Signed-off-by: faux123 <reioux@gmail.com>

Conflicts:
	drivers/staging/android/lowmemorykiller.c
netfilter: xt_qtaguid: Allow tracking loopback

In the past it would always ignore interfaces with loopback addresses.
Now we just treat them like any other.
This also helps with writing tests that check for the presence
of the qtaguid module.

Signed-off-by: JP Abgrall <jpa@google.com>
defconfig: enable RCU boost
cpufreq_interactive: reverted
Revert "BFQ: Change elevator_type to type"

This reverts commit 2b86be6423f682e162bf9cb8b4f0108f6215dc3d.
Revert "block: remove aliased requests from BFQ"

This reverts commit f88c6ca2aa9be246e919e09529001254a235cd3b.
Revert "block: introduce the BFQ-v5r1 I/O sched for 3.0"

This reverts commit 209a40b440670f56c49093a9d7538fd6b0c89dd2.
Revert "block: cgroups, kconfig, build bits for BFQ-v5r1-3.0"

This reverts commit 5cbae712bb678509e7f86376970a2e3189cd729e.
Revert "block: prepare I/O context code for BFQ-v5r1 for 3.0"

This reverts commit 78079697bd3600059b15ed55519613be5fbd102a.
block: prepare I/O context code for BFQ-v6 for 3.0

BFQ uses struct cfq_io_context to store its per-process per-device data,
reusing the same code for cic handling of CFQ.  The code is not shared
ATM to minimize the impact of these patches.

This patch introduces a new hlist to each io_context to store all the
cic's allocated by BFQ to allow calling the right destructor on module
unload; the radix tree used for cic lookup needs to be duplicated
because it can contain dead keys inserted by a scheduler and later
retrieved by the other one.

Update the io_context exit and free paths to take care also of
the BFQ cic's.

Change the type of cfqq inside struct cfq_io_context to void *
to use it also for BFQ per-queue data.

A new bfq-specific ioprio_changed field is necessary, too, to avoid
clobbering cfq's one, so switch ioprio_changed to a bitmap, with one
element per scheduler.

Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>

Conflicts:
	block/Kconfig.iosched
block: cgroups, kconfig, build bits for BFQ-v6-3.0

Add a Kconfig option and do the related Makefile changes to compile
the BFQ I/O scheduler.  Also add the bfqio controller to the cgroups
subsystem.

Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>

Conflicts:
	block/Makefile
block: introduce the BFQ-v6 I/O sched for 3.0

Add the BFQ-v6 I/O scheduler to 3.0.
The general structure is borrowed from CFQ, as much code. A (bfq_)queue is
associated to each task doing I/O on a device, and each time a scheduling
decision has to be made a queue is selected and served until it expires.

    - Slices are given in the service domain: tasks are assigned budgets,
      measured in number of sectors. Once got the disk, a task must
      however consume its assigned budget within a configurable maximum time
      (by default, the maximum possible value of the budgets is automatically
      computed to comply with this timeout). This allows the desired latency
      vs "throughput boosting" tradeoff to be set.

    - Budgets are scheduled according to a variant of WF2Q+, implemented
      using an augmented rb-tree to take eligibility into account while
      preserving an O(log N) overall complexity.

    - A low-latency tunable is provided; if enabled, both interactive and soft
      real-time applications are guaranteed very low latency.

    - Latency guarantees are preserved also in presence of NCQ.

    - Also with flash-based devices, a high throughput is achieved while
      still preserving latency guarantees.

    - A useful feature borrowed from CFQ: static fallback queue for OOM.

    - Differently from CFQ, BFQ uses a unified mechanism (Early Queue Merge,
      EQM) to get a sequential read pattern, and hence a high throughput,
      with any set of processes performing interleaved I/O. EQM also
      preserves low latency. The code for detecting whether two queues have
      to be merged is a slightly modified version of the CFQ code for
      detecting whether two queues belong to cooperating processes and whether
      the service of a queue should be preempted to boost the throughput.

    - BFQ supports full hierarchical scheduling, exporting a cgroups
      interface.  Each node has a full scheduler, so each group can
      be assigned its own ioprio (mapped to a weight, see next point)
      and an ioprio_class.

    - If the cgroups interface is used, weights can be explictly assigned,
      otherwise ioprio values are mapped to weights using the relation
      weight = IOPRIO_BE_NR - ioprio.

    - ioprio classes are served in strict priority order, i.e., lower
      priority queues are not served as long as there are higher priority
      queues.  Among queues in the same class the bandwidth is distributed
      in proportion to the weight of each queue. A very thin extra bandwidth
      is however guaranteed to the Idle class, to prevent it from starving.

Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
block: remove aliased requests from BFQ
BFQ: Change elevator_type to type

Fixes the following compile error:
kernel/amazon/otter-common/block/bfq-cgroup.c: In function 'bfq_cic_change_cgroup':
kernel/amazon/otter-common/block/bfq-cgroup.c:346:36: error: 'struct elevator_queue' has no member named 'elevator_type'

See also "block: remove elevator_queue->ops"
https://github.com/loosethisskin/kernel_omap/commit/29b7005143327edd8f6fc2647d161f8b7655095f
net: wireless: bcmdhd: Add SUPPORT_PM2_ONLY option

Change-Id: Ieb2569cb7fb2bbc56ff9abbc8728a7741fda0027
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
net: wireless: bcmdhd: Enable SUPPORT_PM2_ONLY mode

Change-Id: I4f8132191454f0a12f7613388229fed9be5216c9
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>