Add .gitignore files
block: Adding ROW scheduling algorithm

This patch adds the implementation of a new scheduling algorithm - ROW.
The policy of this algorithm is to prioritize READ requests over WRITE
as much as possible without starving the WRITE requests.

Change-Id: I4ed52ea21d43b0e7c0769b2599779a3d3869c519
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: ROW: Correct minimum values of ROW tunable parameters

The ROW scheduling algorithm exposes several tunable parameters.
This patch updates the minimum allowed values for those parameters.

Change-Id: I5ec19d54b694e2e83ad5376bd99cc91f084967f5
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: ROW: Fix forced dispatch

This patch fixes forced dispatch in the ROW scheduling algorithm.
When the dispatch function is called with the forced flag on, we
can't delay the dispatch of the requests that are in scheduler queues.
Thus, when dispatch is called with forced turned on, we need to cancel
idling, or not to idle at all.

Change-Id: I3aa0da33ad7b59c0731c696f1392b48525b52ddc
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: Add support for reinsert a dispatched req

Add support for reinserting a dispatched request back to the
scheduler's internal data structures.
This capability is used by the device driver when it chooses to
interrupt the current request transmission and execute another (more
urgent) pending request. For example: interrupting long write in order
to handle pending read. The device driver re-inserts the
remaining write request back to the scheduler, to be rescheduled
for transmission later on.

Add API for verifying whether the current scheduler
supports reinserting requests mechanism. If reinsert mechanism isn't
supported by the scheduler, this code path will never be activated.

Change-Id: I5c982a66b651ebf544aae60063ac8a340d79e67f
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: Add API for urgent request handling

This patch add support in block & elevator layers for handling
urgent requests. The decision if a request is urgent or not is taken
by the scheduler. Urgent request notification is passed to the underlying
block device driver (eMMC for example). Block device driver may decide to
interrupt the currently running low priority request to serve the new
urgent request. By doing so READ latency is greatly reduced in read&write
collision scenarios.

Note that if the current scheduler doesn't implement the urgent request
mechanism, this code path is never activated.

Change-Id: I8aa74b9b45c0d3a2221bd4e82ea76eb4103e7cfa
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

row: Adding support for reinsert already dispatched req

Add support for reinserting already dispatched request back to the
schedulers internal data structures.
The request will be reinserted back to the queue (head) it was
dispatched from as if it was never dispatched.

Change-Id: I70954df300774409c25b5821465fb3aa33d8feb5
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block:row: fix idling mechanism in ROW

This patch addresses the following issues found in the ROW idling
mechanism:
1. Fix the delay passed to queue_delayed_work (pass actual delay
   and not the time when to start the work)
2. Change the idle time and the idling-trigger frequency to be
   HZ dependent (instead of using msec_to_jiffies())
3. Destroy idle_workqueue() in queue_exit

Change-Id: If86513ad6b4be44fb7a860f29bd2127197d8d5bf
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

cfq-iosched: Fix null pointer dereference

NULL pointer dereference can happen in cfq_choose_cfqg()
when there are no cfq groups to select other than the
current serving group. Prevent this by adding a NULL
check before dereferencing.

Unable to handle kernel NULL pointer dereference at virtual address
[<c02502cc>] (cfq_dispatch_requests+0x368/0x8c0) from
[<c0243f30>] (blk_peek_request+0x220/0x25c)
[<c0243f30>] (blk_peek_request+0x220/0x25c) from
[<c0243f74>] (blk_fetch_request+0x8/0x1c)
[<c0243f74>] (blk_fetch_request+0x8/0x1c) from
[<c041cedc>] (mmc_queue_thread+0x58/0x120)
[<c041cedc>] (mmc_queue_thread+0x58/0x120) from
[<c00ad310>] (kthread+0x84/0x90)
[<c00ad310>] (kthread+0x84/0x90) from
[<c000eeac>] (kernel_thread_exit+0x0/0x8)

CRs-Fixed: 416466
Change-Id: I1fab93a4334b53e1d7c5dcc8f93cff174bae0d5e
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>

row: Add support for urgent request handling

This patch adds support for handling urgent requests.
ROW queue can be marked as "urgent" so if it was un-served in last
dispatch cycle and a request was added to it - it will trigger
issuing an urgent-request-notification to the block device driver.
The block device driver may choose at stop the transmission of current
ongoing request to handle the urgent one. Foe example: long WRITE may
be stopped to handle an urgent READ. This decreases READ latency.

Change-Id: I84954c13f5e3b1b5caeadc9fe1f9aa21208cb35e
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Add some debug information on ROW queues

1. Add a counter for number of requests on queue.
2. Add function to print queues status (number requests
   currently on queue and number of already dispatched requests
   in current dispatch cycle).

Change-Id: I1e98b9ca33853e6e6a8ddc53240f6cd6981e6024
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Insert dispatch_quantum into struct row_queue

There is really no point in keeping the dispatch quantum
of a queue outside of it. By inserting it to the row_queue
structure we spare extra level in accessing it.

Change-Id: Ic77571818b643e71f9aafbb2ca93d0a92158b199
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: fix sysfs functions - idle_time conversion

idle_time was updated to be stored in msec instead of jiffies.
So there is no need to convert the value when reading from user or
displaying the value to him.

Change-Id: I58e074b204e90a90536d32199ac668112966e9cf
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Aggregate row_queue parameters to one structure

Each ROW queues has several parameters which default values are defined
in separate arrays. This patch aggregates all default values into one
array.
The values in question are:
 - is idling enabled for the queue
 - queue quantum
 - can the queue notify on urgent request

Change-Id: I3821b0a042542295069b340406a16b1000873ec6
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Dispatch requests according to their io-priority

This patch implements "application-hints" which is a way the issuing
application can notify the scheduler on the priority of its request.
This is done by setting the io-priority of the request.
This patch reuses an already existing mechanism of io-priorities developed
for CFQ. Please refer to kernel/Documentation/block/ioprio.txt for
usage example and explanations.

Change-Id: I228ec8e52161b424242bb7bb133418dc8b73925a
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Idling mechanism re-factoring

At the moment idling in ROW is implemented by delayed work that uses
jiffies granularity which is not very accurate. This patch replaces
current idling mechanism implementation with hrtime API, which gives
nanosecond resolution (instead of jiffies).

Change-Id: I86c7b1776d035e1d81571894b300228c8b8f2d92
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Don't notify URGENT if there are un-completed urgent req

When ROW scheduler reports to the block layer that there is an urgent
request pending, the device driver may decide to stop the transmission
of the current request in order to handle the urgent one. If the current
transmitted request is an urgent request - we don't want it to be
stopped.
Due to the above ROW scheduler won't notify of an urgent request if
there are urgent requests in flight.

Change-Id: I2fa186d911b908ec7611682b378b9cdc48637ac7
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Update initial values of ROW data structures

This patch sets the initial values of internal ROW
parameters.

Change-Id: I38132062a7fcbe2e58b9cc757e55caac64d013dc
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
[smuckle@codeaurora.org: ported from msm-3.7]
Signed-off-by: Steve Muckle <smuckle@codeaurora.org>

block: add REQ_URGENT to request flags

This patch adds a new flag to be used in cmd_flags field of struct request
for marking request as urgent.
Urgent request is the one that should be given priority currently handled
(regular) request by the device driver. The decision of a request urgency
is taken by the scheduler.

Change-Id: Ic20470987ef23410f1d0324f96f00578f7df8717
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Re-design urgent request notification mechanism

When ROW scheduler reports to the block layer that there is an urgent
request pending, the device driver may decide to stop the transmission
of the current request in order to handle the urgent one. This is done
in order to reduce the latency of an urgent request. For example:
long WRITE may be stopped to handle an urgent READ.

This patch updates the ROW URGENT notification policy to apply with the
below:

- Don't notify URGENT if there is an un-completed URGENT request in driver
- After notifying that URGENT request is present, the next request
  dispatched is the URGENT one.
- At every given moment only 1 request can be marked as URGENT.
  Independent of it's location (driver or scheduler)

Other changes to URGENT policy:
- Only READ queues are allowed to notify of an URGENT request pending.

CR fix:
If a pending urgent request (A) gets merged with another request (B)
A is removed from scheduler queue but is not removed from
rd->pending_urgent_rq.

CRs-Fixed: 453712
Change-Id: I321e8cf58e12a05b82edd2a03f52fcce7bc9a900
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: urgent request: remove unnecessary urgent marking

An urgent request is marked by the scheduler in rq->cmd_flags with the
REQ_URGENT flag. There is no need to add an additional marking by
the block layer.

Change-Id: I05d5e9539d2f6c1bfa80240b0671db197a5d3b3f
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Prevent starvation of regular priority by high priority

At the moment all REGULAR and LOW priority requests are starved as long as
there are HIGH priority requests to dispatch.
This patch prevents the above starvation by setting a starvation limit the
REGULAR\LOW priority requests can tolerate.

Change-Id: Ibe24207982c2c55d75c0b0230f67e013d1106017
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Update sysfs functions

All ROW (time related) configurable parameters are stored in ms so there
is no need to convert from/to ms when reading/updating them via sysfs.

Change-Id: Ib6a1de54140b5d25696743da944c076dd6fc02ae
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: urgent request: Update dispatch_urgent in case of requeue/reinsert

The block layer implements a mechanism for verifying that the device
driver won't be notified of an URGENT request if there is already an
URGENT request in flight. This is due to the fact that interrupting an
URGENT request isn't efficient.
This patch fixes the above described mechanism in case the URGENT request
was returned back to the block layer from some reason: by requeue or
reinsert.

CRs-fixed: 473376, 473036, 471736
Change-Id: Ie8b8208230a302d4526068531616984825f1050d
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: row: Fix starvation tolerance values

The current starvation tolerance values increase the boot time
since high priority SW requests are delayed by regular priority requests.
In order to overcome this, increase the starvation tolerance values.

Change-Id: I9947fca9927cbd39a1d41d4bd87069df679d3103
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Maya Erez <merez@codeaurora.org>

block: urgent: Fix dispatching of URGENT mechanism

There are cases when blk_peek_request is called not from blk_fetch_request
thus the URGENT request may be started but the flag q->dispatched_urgent is
not updated.

Change-Id: I4fb588823f1b2949160cbd3907f4729767932e12
CRs-fixed: 471736
CRs-fixed: 473036
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>

block: Remove "requeuing urgent req" error messages

It is possible for URGENT request to be requeued/reinserted if it was
fetched during the creation of a packed list. This end case is rare and is
not handled at the moment.
This patch changes the messages notifying of the above to debug level
(instead of error) in order to clear the dmesg log.

Change-Id: Ie8bc067e61559a6f702077b95c5dbcc426404232
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
block: row-iosched idling triggered by readahead pages

In the current implementation idling is triggered only by request
insertion frequency. This heuristic is not very accurate and may hit
random requests that shouldn't trigger idling. This patch uses the
PG_readahead flag in struct page's flags, which indicates that the page
is part of a readahead window, to start idling upon dispatch of a request
associated with a readahead page.

The above readehead flag is used together with the existing
insertion-frequency trigger. The frequency timer will catch read requests
which are not part of a readahead window, but are still part of a
sequential stream (and therefore dispatched in small time intervals).

Change-Id: Icb7145199c007408de3f267645ccb842e051fd00
Signed-off-by: Lee Susman <lsusman@codeaurora.org>
block: row: change hrtimer_cancel to hrtimer_try_to_cancel

Calling hrtimer_cancel with interrupts disabled can result in a livelock.
When flushing plug list in the block layer interrupts are disabled and an
hrtimer is used when adding requests from that plug list to the scheduler.
In this code flow, if the hrtimer (which is used for idling) is set, it's
being canceled by calling hrtimer_cancel. hrtimer_cancel will perform
the following in an endless loop:
1. try cancel the timer
2. if fails - rest_cpu
the cancellation can fail if the timer function already started. Since
interrupts are disabled it can never complete.
This patch reduced the number of times the hrtimer lock is taken while
interrupts are disabled by calling hrtimer_try_co_cancel. the later will
try to cancel the timer just once and return with an error code if fails.

CRs-fixed: 499887
Change-Id: I25f79c357426d72ad67c261ce7cb503ae97dc7b9
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
block: cgroups, kconfig, build bits for BFQ-v6r2-3.4

Update Kconfig.iosched and do the related Makefile changes to include
kernel configuration options for BFQ. 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>
block: introduce the BFQ-v6r2 I/O sched for 3.4

Add the BFQ-v6r2 I/O scheduler to 3.4.
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.

    - Useful features borrowed from CFQ: cooperating-queues merging (with
      some additional optimizations with respect to the original CFQ version),
      static fallback queue for OOM.

    - 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, bfq: add Early Queue Merge (EQM) to BFQ-v6r2 for 3.4.0

A set of processes may happen  to  perform interleaved reads, i.e., requests
whose union would give rise to a  sequential read  pattern.  There   are two
typical  cases: in the first  case,   processes  read  fixed-size  chunks of
data at a fixed distance from each other, while in the second case processes
may read variable-size chunks at  variable distances. The latter case occurs
for  example with  KVM, which  splits the  I/O generated  by the  guest into
multiple chunks,  and lets these chunks  be served by a  pool of cooperating
processes,  iteratively  assigning  the  next  chunk of  I/O  to  the  first
available  process. CFQ  uses actual  queue merging  for the  first type  of
processes, whereas it  uses preemption to get a sequential  read pattern out
of the read requests  performed by the second type of  processes. In the end
it uses  two different  mechanisms to  achieve the  same goal:  boosting the
throughput with interleaved I/O.

This patch introduces  Early Queue Merge (EQM), a unified mechanism to get a
sequential  read pattern  with both  types of  processes. The  main idea  is
checking newly arrived requests against the next request of the active queue
both in case of actual request insert and in case of request merge. By doing
so, both the types of processes can be handled by just merging their queues.
EQM is  then simpler and  more compact than the  pair of mechanisms  used in
CFQ.

Finally, EQM  also preserves the  typical low-latency properties of  BFQ, by
properly restoring the weight-raising state of  a queue when it gets back to
a non-merged state.

Signed-off-by: Mauro Andreolini <mauro.andreolini@unimore.it>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
Reviewed-by: Paolo Valente <paolo.valente@unimore.it>
drivers: staging: Fix Zcache

 * Remove dependency on obsolete qcache
 * Remove X86 dependency as this version of zsmalloc supports ARM
 * Fix args for updated zsmalloc
 * Enable for JF

Change-Id: I7a6daf84246df54bb8030268d07a96256db4fc42
serrano: Merge with MG3

Conflicts:
	drivers/input/touchscreen/mxts.c
Merge with GT-I9195_JB_Opensource_Update1.zip

Change-Id: I84c8b824117f4b014c9539340686385db80b795b
fs: Add exFAT file system

Change-Id: I7b611a7290e13b382597b34e68f05c78e19c4895
Squashed revert of ROW scheduler

Change-Id: I8530cbcb55138b87696e22bbaa7d9033f74728dc
Revert "Squashed revert of ROW scheduler"

This reverts commit f811bd3aeb65e943db43cca5a48fc420aa53ace7.
Merge with MK4 kernel source

Change-Id: I67b494555fe4868e0aff1565c7db2f0d435738dd

Conflicts:
	include/linux/wcnss_wlan.h
add build script

Signed-off-by: Willi Ye <williye97@gmail.com>

Conflicts:
	arch/arm/configs/msm8930_baffinvetd_defconfig
	arch/arm/configs/msm8930_biscotto_defconfig
	arch/arm/configs/msm8930_biscotto_eng_defconfig
	arch/arm/configs/msm8930_cane_defconfig
	arch/arm/configs/msm8930_crater_00_defconfig
	arch/arm/configs/msm8930_cratertd_defconfig
	arch/arm/configs/msm8930_express2_defconfig
	arch/arm/configs/msm8930_express_defconfig
	arch/arm/configs/msm8930_golden_att_defconfig
	arch/arm/configs/msm8930_golden_defconfig
	arch/arm/configs/msm8930_golden_eng_defconfig
	arch/arm/configs/msm8930_golden_vzw_defconfig
	arch/arm/configs/msm8930_higgs_defconfig
	arch/arm/configs/msm8930_higgs_eng_defconfig
	arch/arm/configs/msm8930_jasper2_defconfig
	arch/arm/configs/msm8930_jasper2_eng_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_rev02_defconfig
	arch/arm/configs/msm8930_ks02_defconfig
	arch/arm/configs/msm8930_ks02_skt_defconfig
	arch/arm/configs/msm8930_lt02-chn_defconfig
	arch/arm/configs/msm8930_lt02_att_defconfig
	arch/arm/configs/msm8930_lt02_chnctc_defconfig
	arch/arm/configs/msm8930_lt02_defconfig
	arch/arm/configs/msm8930_lt02_eng_defconfig
	arch/arm/configs/msm8930_lt02_spr_defconfig
	arch/arm/configs/msm8930_melius_00_defconfig
	arch/arm/configs/msm8930_melius_att_defconfig
	arch/arm/configs/msm8930_melius_chncmcc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnctc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnopen_3g_defconfig
	arch/arm/configs/msm8930_melius_eng_defconfig
	arch/arm/configs/msm8930_melius_ktt_defconfig
	arch/arm/configs/msm8930_melius_lgt_defconfig
	arch/arm/configs/msm8930_melius_skt_defconfig
	arch/arm/configs/msm8930_melius_spr_defconfig
	arch/arm/configs/msm8930_melius_tmo_defconfig
	arch/arm/configs/msm8930_melius_usc_defconfig
	arch/arm/configs/msm8930_melius_vzw_defconfig
	arch/arm/configs/msm8930_melius_zh_lte_defconfig
	arch/arm/configs/msm8930_serrano_att_defconfig
	arch/arm/configs/msm8930_serrano_defconfig
	arch/arm/configs/msm8930_serrano_eng_defconfig
	arch/arm/configs/msm8930_serrano_spr_defconfig
	arch/arm/configs/msm8930_serrano_tmo_defconfig
	arch/arm/configs/msm8930_serrano_usa_defconfig
	arch/arm/configs/msm8930_serrano_usc_defconfig
	arch/arm/configs/msm8930_serrano_vzw_defconfig
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig

Conflicts:
	arch/arm/configs/msm8930_baffinvetd_defconfig
	arch/arm/configs/msm8930_biscotto_defconfig
	arch/arm/configs/msm8930_biscotto_eng_defconfig
	arch/arm/configs/msm8930_cane_defconfig
	arch/arm/configs/msm8930_crater_00_defconfig
	arch/arm/configs/msm8930_cratertd_defconfig
	arch/arm/configs/msm8930_express2_defconfig
	arch/arm/configs/msm8930_express_defconfig
	arch/arm/configs/msm8930_golden_att_defconfig
	arch/arm/configs/msm8930_golden_defconfig
	arch/arm/configs/msm8930_golden_eng_defconfig
	arch/arm/configs/msm8930_golden_vzw_defconfig
	arch/arm/configs/msm8930_higgs_defconfig
	arch/arm/configs/msm8930_higgs_eng_defconfig
	arch/arm/configs/msm8930_jasper2_defconfig
	arch/arm/configs/msm8930_jasper2_eng_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_rev02_defconfig
	arch/arm/configs/msm8930_ks02_defconfig
	arch/arm/configs/msm8930_ks02_skt_defconfig
	arch/arm/configs/msm8930_lt02-chn_defconfig
	arch/arm/configs/msm8930_lt02_att_defconfig
	arch/arm/configs/msm8930_lt02_chnctc_defconfig
	arch/arm/configs/msm8930_lt02_defconfig
	arch/arm/configs/msm8930_lt02_eng_defconfig
	arch/arm/configs/msm8930_lt02_spr_defconfig
	arch/arm/configs/msm8930_melius_00_defconfig
	arch/arm/configs/msm8930_melius_att_defconfig
	arch/arm/configs/msm8930_melius_chncmcc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnctc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnopen_3g_defconfig
	arch/arm/configs/msm8930_melius_eng_defconfig
	arch/arm/configs/msm8930_melius_ktt_defconfig
	arch/arm/configs/msm8930_melius_lgt_defconfig
	arch/arm/configs/msm8930_melius_skt_defconfig
	arch/arm/configs/msm8930_melius_spr_defconfig
	arch/arm/configs/msm8930_melius_tmo_defconfig
	arch/arm/configs/msm8930_melius_usc_defconfig
	arch/arm/configs/msm8930_melius_vzw_defconfig
	arch/arm/configs/msm8930_melius_zh_lte_defconfig
	arch/arm/configs/msm8930_serrano_att_defconfig
	arch/arm/configs/msm8930_serrano_defconfig
	arch/arm/configs/msm8930_serrano_eng_defconfig
	arch/arm/configs/msm8930_serrano_spr_defconfig
	arch/arm/configs/msm8930_serrano_tmo_defconfig
	arch/arm/configs/msm8930_serrano_usa_defconfig
	arch/arm/configs/msm8930_serrano_usc_defconfig
	arch/arm/configs/msm8930_serrano_vzw_defconfig
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/configs/selinux_defconfig
	build-all.py

Conflicts:
	arch/arm/configs/msm8930_baffinvetd_defconfig
	arch/arm/configs/msm8930_biscotto_defconfig
	arch/arm/configs/msm8930_biscotto_eng_defconfig
	arch/arm/configs/msm8930_cane_defconfig
	arch/arm/configs/msm8930_crater_00_defconfig
	arch/arm/configs/msm8930_cratertd_defconfig
	arch/arm/configs/msm8930_express2_defconfig
	arch/arm/configs/msm8930_express_defconfig
	arch/arm/configs/msm8930_golden_att_defconfig
	arch/arm/configs/msm8930_golden_defconfig
	arch/arm/configs/msm8930_golden_eng_defconfig
	arch/arm/configs/msm8930_golden_vzw_defconfig
	arch/arm/configs/msm8930_higgs_defconfig
	arch/arm/configs/msm8930_higgs_eng_defconfig
	arch/arm/configs/msm8930_jasper2_defconfig
	arch/arm/configs/msm8930_jasper2_eng_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_defconfig
	arch/arm/configs/msm8930_jasper2_vzw_rev02_defconfig
	arch/arm/configs/msm8930_ks02_defconfig
	arch/arm/configs/msm8930_ks02_skt_defconfig
	arch/arm/configs/msm8930_lt02-chn_defconfig
	arch/arm/configs/msm8930_lt02_att_defconfig
	arch/arm/configs/msm8930_lt02_chnctc_defconfig
	arch/arm/configs/msm8930_lt02_defconfig
	arch/arm/configs/msm8930_lt02_eng_defconfig
	arch/arm/configs/msm8930_lt02_spr_defconfig
	arch/arm/configs/msm8930_melius_00_defconfig
	arch/arm/configs/msm8930_melius_att_defconfig
	arch/arm/configs/msm8930_melius_chncmcc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnctc_3g_defconfig
	arch/arm/configs/msm8930_melius_chnopen_3g_defconfig
	arch/arm/configs/msm8930_melius_eng_defconfig
	arch/arm/configs/msm8930_melius_ktt_defconfig
	arch/arm/configs/msm8930_melius_lgt_defconfig
	arch/arm/configs/msm8930_melius_skt_defconfig
	arch/arm/configs/msm8930_melius_spr_defconfig
	arch/arm/configs/msm8930_melius_tmo_defconfig
	arch/arm/configs/msm8930_melius_usc_defconfig
	arch/arm/configs/msm8930_melius_vzw_defconfig
	arch/arm/configs/msm8930_melius_zh_lte_defconfig
	arch/arm/configs/msm8930_serrano_att_defconfig
	arch/arm/configs/msm8930_serrano_defconfig
	arch/arm/configs/msm8930_serrano_eng_defconfig
	arch/arm/configs/msm8930_serrano_spr_defconfig
	arch/arm/configs/msm8930_serrano_tmo_defconfig
	arch/arm/configs/msm8930_serrano_usa_defconfig
	arch/arm/configs/msm8930_serrano_usc_defconfig
	arch/arm/configs/msm8930_serrano_vzw_defconfig
	arch/arm/configs/msm8960-perf_defconfig
	arch/arm/configs/msm8960_defconfig
	arch/arm/configs/selinux_defconfig
	build-all.py
config dump

Signed-off-by: Willi Ye <williye97@gmail.com>
update ramdisk and config dump

Signed-off-by: Willi Ye <williye97@gmail.com>
build prima module

Signed-off-by: Willi Ye <williye97@gmail.com>
block: bfq: Squashed update from BFQ-v6r2 to BFQ-v7r1

Change-Id: I7498f1f60253b0631a0ce36e7c20d6ec4e1df8f5
block: bfq: Squashed update from BFQ-v7r1 to BFQ-v7r2

Change-Id: I90a2156ae874fed703aafa22b721f59a0db40c51