diff options
| author | Ian Maund <imaund@codeaurora.org> | 2014-08-20 13:23:09 -0700 |
|---|---|---|
| committer | Ian Maund <imaund@codeaurora.org> | 2014-08-20 13:23:09 -0700 |
| commit | 6440f462f94d202743ad56c859ae6df95aab1a60 (patch) | |
| tree | c54d8f6d68ecce65c17ff05d8c39e8cf595dae09 /Makefile | |
| parent | d5fc7ff6082bbcf7c65ab3a9de890ad37432e61a (diff) | |
| parent | d02dae430d1f41f2c1dc8592f68569f90b86f6d9 (diff) | |
| download | qcom-msm-v3.10-6440f462f94d202743ad56c859ae6df95aab1a60.tar.gz | |
Merge upstream tag 'v3.10.49' into msm-3.10
* commit 'v3.10.49': (529 commits)
Linux 3.10.49
ACPI / battery: Retry to get battery information if failed during probing
x86, ioremap: Speed up check for RAM pages
Score: Modify the Makefile of Score, remove -mlong-calls for compiling
Score: The commit is for compiling successfully.
Score: Implement the function csum_ipv6_magic
score: normalize global variables exported by vmlinux.lds
rtmutex: Plug slow unlock race
rtmutex: Handle deadlock detection smarter
rtmutex: Detect changes in the pi lock chain
rtmutex: Fix deadlock detector for real
ring-buffer: Check if buffer exists before polling
drm/radeon: stop poisoning the GART TLB
drm/radeon: fix typo in golden register setup on evergreen
ext4: disable synchronous transaction batching if max_batch_time==0
ext4: clarify error count warning messages
ext4: fix unjournalled bg descriptor while initializing inode bitmap
dm io: fix a race condition in the wake up code for sync_io
Drivers: hv: vmbus: Fix a bug in the channel callback dispatch code
clk: spear3xx: Use proper control register offset
...
In addition to bringing in upstream commits, this merge also makes minor
changes to mainitain compatibility with upstream:
The definition of list_next_entry in qcrypto.c and ipa_dp.c has been
removed, as upstream has moved the definition to list.h. The implementation
of list_next_entry was identical between the two.
irq.c, for both arm and arm64 architecture, has had its calls to
__irq_set_affinity_locked updated to reflect changes to the API upstream.
Finally, as we have removed the sleep_length member variable of the
tick_sched struct, all changes made by upstream commit ec804bd do not
apply to our tree and have been removed from this merge. Only
kernel/time/tick-sched.c is impacted.
Change-Id: I63b7e0c1354812921c94804e1f3b33d1ad6ee3f1
Signed-off-by: Ian Maund <imaund@codeaurora.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 40 +SUBLEVEL = 49 EXTRAVERSION = NAME = TOSSUG Baby Fish |