summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-13backports: refresh patches on v3.11.8v3.11.8-1Hauke Mehrtens
== ckmake-report.log == 1 2.6.25 [ OK ] 2 2.6.26 [ OK ] 3 2.6.27 [ OK ] 4 2.6.28 [ OK ] 5 2.6.29 [ OK ] 6 2.6.30 [ OK ] 7 2.6.31 [ OK ] 8 2.6.32 [ OK ] 9 2.6.33 [ OK ] 10 2.6.34 [ OK ] 11 2.6.35 [ OK ] 12 2.6.36 [ OK ] 13 2.6.37 [ OK ] 14 2.6.38 [ OK ] 15 2.6.39 [ OK ] 16 3.0.101 [ OK ] 17 3.1.10 [ OK ] 18 3.10.17 [ OK ] 19 3.11.6 [ OK ] 20 3.12-rc7 [ FAIL ] 21 3.2.52 [ OK ] 22 3.3.8 [ OK ] 23 3.4.67 [ OK ] 24 3.5.7 [ OK ] 25 3.6.11 [ OK ] 26 3.7.10 [ OK ] 27 3.8.13 [ OK ] 28 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28backports: refresh patches on v3.11.6v3.11.6-1Hauke Mehrtens
1 2.6.25 [ OK ] 2 2.6.26 [ OK ] 3 2.6.27 [ OK ] 4 2.6.28 [ OK ] 5 2.6.29 [ OK ] 6 2.6.30 [ OK ] 7 2.6.31 [ OK ] 8 2.6.32 [ OK ] 9 2.6.33 [ OK ] 10 2.6.34 [ OK ] 11 2.6.35 [ OK ] 12 2.6.36 [ OK ] 13 2.6.37 [ OK ] 14 2.6.38 [ OK ] 15 2.6.39 [ OK ] 16 3.0.98 [ OK ] 17 3.1.10 [ OK ] 18 3.10.17 [ OK ] 19 3.11.6 [ OK ] 20 3.12-rc3 [ FAIL ] 21 3.2.51 [ OK ] 22 3.3.8 [ OK ] 23 3.4.64 [ OK ] 24 3.5.7 [ OK ] 25 3.6.11 [ OK ] 26 3.7.10 [ OK ] 27 3.8.13 [ OK ] 28 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28backports: Atheros atl1c needs build_skb(), do not build on < 3.5Hauke Mehrtens
Upstream commit: 09556c795e8afb6672893d41a05a6728c306e5f6 The Atheros atl1c driver now uses build_skb() which was added in 3.5. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28backports: add hid_alloc_report_buf()Hauke Mehrtens
Upstream commit: 1a996968fc51cc1323e1bedceb32143aa1226e9b Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28backports: fix typo in defineHauke Mehrtens
Upstream commit: 551f46cb4472f03bea0df808ef892ea8eb49a2af This fixes a build error one some non x86 systems. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28backports: do not depend on PCI functions when PCI is disabled in the kernelHauke Mehrtens
Upstream commit: 168beb7a3dad933d29f8e0dabd37db8cf189a4c7 This should prevent some compile errors when backports is used with a kernel without PCI support. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28backports: use correct suspend/resume function for rtl8188eeHauke Mehrtens
Upstream commit: 6bc60d332b7109c99cd5f5d5f8b7791f921289d6 The newly created function ends with _compat. This causes compile warnings and probably runtime problems on kernel < 2.6.29. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28gentree.py: add v as prefix for stable folder nameHauke Mehrtens
Upstream commit: 72657d3ff7c144a85b0b916c81bfeaa54e2d623f The folder name did not started with an v. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28genlib: add missing slash to korg_path for stableHauke Mehrtens
Upstream commit: 4fb89169e8a5969388b16771695452f55ceb43e6 Without this slash it wants to use the directory /backportsstable/ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28gentree.py: add ending slash to upload pathHauke Mehrtens
Upstream commit: 3455026991cda1129ae313830ecd7386f75362a5 the filename in kup put should end with a slash otherwise it tried to overwrite this file. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28gentree.py: log kup command before executingHauke Mehrtens
Upstream commit: fdda21c96cc00461127a394e22eea3f7cb1119a5 Add a logging of the next command to be executed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28gentree.py: fix directory creatingHauke Mehrtens
Upstream commit: efdb6bbb9cd89d3174dbdecf02b79c0f294e3d10 The full path has to be provided not just the new directory to create. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28gentree.py: do not add full path into tarHauke Mehrtens
Upstream commit: 515e82602216fc40a224f02f34d0a0f0c03c8309 dir_to_tar could be the absolute path to the directory to to tar, but we do not want the full patch in the tar, just the basename. In addition the second close is not necessary. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2013-10-28gentree.py: add kernel upload supportLuis R. Rodriguez
Upstream commit: 10eca9f5bef1821de09601a3a7db7eb337c56ba0 This streamlines our release process making it easier for transitioning releases onto other backport developers. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28lib/bpkup.py: add or own kernel uploader helper libLuis R. Rodriguez
Upstream commit: 57554a365682979473778ffca9a9c5c82ab4dee6 kup is written in perl, add some basic python interfaces for it to allow us to upload to kernel.org backport releases. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28lib/bpgpg.py: add simple gpg helper for gpg signingLuis R. Rodriguez
Upstream commit: dcd5524fc04730b0af05b28388d246cad97a91c2 Note that kup expects --armor --detach-sign, we'll pass that as part of our extra_args. The python gpg lib doesn't provide support for random arguments as this one, so just add our own little helper and carry it over. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28lib/bpgit.py: add support for git paranoiaLuis R. Rodriguez
Upstream commit: f9fa9dac70b99a2cf12b494a9fe4440404a30c4e This cleans sanitizes a source tree and ensures no content is present from what was intended. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28lib/bpgit.py: add git tree verification supportLuis R. Rodriguez
Upstream commit: 455aae0352d34e97fc5910927428c9f8ff44f77a This verifies that the tree provided has its last commit both tagged and also digitally signed. In short it does: git tag -v $(git describe --dirty) This will be used later. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28lib/bpgit.py: add git clean supportLuis R. Rodriguez
Upstream commit: 52aca1afb093baef20140b33d50426ecf80d3f6d We'll use this later. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28lib/bpgit.py: add git status supportLuis R. Rodriguez
Upstream commit: 276bf778df6e33f66391e4cea9cbceb888db6f9d We use --porcelain given that this spits out the results in an easy-to-parse format for scripts and will remain stable across git versions and regardless of user configuration. We will use this later. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-10-28lib/bpgit.py: enable extra arguments on git describeLuis R. Rodriguez
Upstream commit: ea70308d746325654d44851be602fe02492b59f9 This lets us throw at it whatever extra stuff we want. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-08-12backports: refresh patches for v3.11-rc5Luis R. Rodriguez
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-08-12backports: fix device_release_driverJohannes Berg
Upstream commit 38dbdde48f135c6b8fd1524eacf79041c7b5899a The new macro, introduced by commit 9f5876fa9cfb8cd6f450c200043ca7e31915f976 Author: Luis R. Rodriguez <mcgrof@do-not-panic.com> Date: Thu Jul 18 16:40:55 2013 -0700 backports: backport drvdata = NULL core driver fixes evaluates its argument multiple times, causing crashes as there are potential side-effects of the called code and/or the arguments. Fix this by converting it to static inlines. Also remove the driver_probe_device() macro that has the same issue, but tries to wrap a function that isn't even available outside the driver core code in any kernel. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-08-12backports: fix ath5k multicast patch contextLuis R. Rodriguez
The ath5k driver was patched on v3.11-rc4 with the following fix which threw off a backport patch. mcgrof@garbanzo ~/linux-stable (git::master)$ git describe --contains \ f287cbd01f2e8e1b325b96233c373619c2d25ee2 v3.11-rc4~5^2~27^2^2~23 commit f287cbd01f2e8e1b325b96233c373619c2d25ee2 Author: Bob Copeland <me@bobcopeland.com> Date: Thu Jul 11 09:19:13 2013 -0400 ath5k: fix extra set bit in multicast mask Bit 32 was always set which looks to have been accidental, according to git history. Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-08-12backprots: fix logic in calling intel_enable_gtt()Hauke Mehrtens
Upstream commit d611a3226cb97e33b5fe7e43234e91d126de9c42 The old patch changed the or condition to an and condition which is wrong. This patch fixes the logic again. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: refresh patches for v3.11-rc3v3.11-rc3-1Luis R. Rodriguez
1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] real 34m26.742s user 929m30.328s sys 128m39.452s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: remove DRM shrinkers patchesLuis R. Rodriguez
<sad_trombone>This did not make it to v3.11</sad_trombone> commit 84292b549bf48f80d470215b357179ea13d64a35 Author: Dave Chinner <dchinner@redhat.com> Date: Wed Jul 3 10:19:58 2013 +1000 drivers: convert shrinkers to new count/scan API Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: refresh patches for next-20130712backports-20130712Luis R. Rodriguez
1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] real 34m34.417s user 933m25.264s sys 129m41.580s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: refresh patches for next-20130709Luis R. Rodriguez
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: copy over s2mps11.hLuis R. Rodriguez
This is required by s2mps11 as of at least next-20130709. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: fix patches for next-20130709Luis R. Rodriguez
A hunk context was off for alx. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: refresh patches for next-20130703Luis R. Rodriguez
1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] real 32m59.877s user 880m31.524s sys 124m11.996s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: backport cross-device reservation supportLuis R. Rodriguez
This backports cross-device reservation support. Given that this feature is built around the CONFIG_DMA_SHARED_BUFFER and given that some older kernels will have DMA_SHARED_BUFFER without cross device reservation support we can't use the c-file and h-file backports Kconfig trick to automatically backport this feature from the target git tree. commit 786d7257e537da0674c02e16e3b30a44665d1cee Author: Maarten Lankhorst <m.b.lankhorst@gmail.com> Date: Thu Jun 27 13:48:16 2013 +0200 reservation: cross-device reservation support, v4 This adds support for a generic reservations framework that can be hooked up to ttm and dma-buf and allows easy sharing of reservations across devices. The idea is that a dma-buf and ttm object both will get a pointer to a struct reservation_object, which has to be reserved before anything is done with the contents of the dma-buf. Changes since v1: - Fix locking issue in ticket_reserve, which could cause mutex_unlock to be called too many times. Changes since v2: - All fence related calls and members have been taken out for now, what's left is the bare minimum to be useful for ttm locking conversion. Changes since v3: - Removed helper functions too. The documentation has an example implementation for locking. With the move to ww_mutex there is no need to have much logic any more. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Cc: maarten.lankhorst@canonical.com Cc: jglisse@redhat.com Cc: airlied@redhat.com Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: backport ww_mutex supportLuis R. Rodriguez
This backports the kernel's wound/wait style locks 040a0a371, using the linux-stable v3.11-rc2 as a base for development. Given the complexity to support debugging mutexes this backport implementation is simplified by only making this feature availabe if you to have DEBUG_MUTEXES and DEBUG_LOCK_ALLOC disabled. Given that ww mutex is required for DRM this also means we must update the kconfig for DRM and require you to also not be able to build DRM if you have either of these options enabled. Support for DEBUG_MUTEXES and DEBUG_LOCK_ALLOC can be added later by anyone daring. This uses the new dependencies file kconfig language extension to specify the backport feature build restrictions for DRM. Part of the ww mutex addition to the kernel required modifying the fast path mutex locking scheme by requiring you to deal with the slow path alternatives on your own (refer to a41b56ef). The reason for this change was that the mutex fastpath implementation assumed your slowpath alternative can only be passed one argument and the addition of ww mutexes requires dealing with the slow path with a context passed. It'd be painful to backport all asm for an optimized fastpath implementation so we penalize the backport ww mutex fast path by using the generic atomic_dec_return(). To backport a clean our own mutex_lock_common() with the least amount of changes against upstream commits 2bd2c92c and 41fcb9f2 also needed to be backported. Commit 2bd2c92c dealt with adding support for queue mutex spinners with an MCS lock, since this cannot be backported for older kernels we provide empty inlines. Commit 41fcb9f2 just removed SCHED_FEAT_OWNER_SPIN as it was an early hack, the only thing required to backport this commit was to provide an alternative declaration for mutex_spin_on_owner() as it was declared non-inline for older kernels. Finally c5491ea7 required backporting schedule_preempt_disabled() as well but that just consisted of carrying over the original implementation. Since its not exported we need to reimplement it to make it available to our internal core ww mutex port. mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains 040a0a371 v3.11-rc1~147^2~5 mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains a41b56ef v3.11-rc1~147^2~6 mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains 2bd2c92c v3.10-rc1~200^2~3 mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains 41fcb9f2 v3.10-rc1~200^2~5 mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains c5491ea7 v3.4-rc1~3^2~27 commit 040a0a37100563754bb1fee6ff6427420bcfa609 Author: Maarten Lankhorst <maarten.lankhorst@canonical.com> Date: Mon Jun 24 10:30:04 2013 +0200 mutex: Add support for wound/wait style locks Wound/wait mutexes are used when other multiple lock acquisitions of a similar type can be done in an arbitrary order. The deadlock handling used here is called wait/wound in the RDBMS literature: The older tasks waits until it can acquire the contended lock. The younger tasks needs to back off and drop all the locks it is currently holding, i.e. the younger task is wounded. For full documentation please read Documentation/ww-mutex-design.txt. References: https://lwn.net/Articles/548909/ Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Rob Clark <robdclark@gmail.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: dri-devel@lists.freedesktop.org Cc: linaro-mm-sig@lists.linaro.org Cc: rostedt@goodmis.org Cc: daniel@ffwll.ch Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/51C8038C.9000106@canonical.com Signed-off-by: Ingo Molnar <mingo@kernel.org> commit a41b56efa70e060f650aeb54740aaf52044a1ead Author: Maarten Lankhorst <maarten.lankhorst@canonical.com> Date: Thu Jun 20 13:31:05 2013 +0200 arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not This will allow me to call functions that have multiple arguments if fastpath fails. This is required to support ticket mutexes, because they need to be able to pass an extra argument to the fail function. Originally I duplicated the functions, by adding __mutex_fastpath_lock_retval_arg. This ended up being just a duplication of the existing function, so a way to test if fastpath was called ended up being better. This also cleaned up the reservation mutex patch some by being able to call an atomic_set instead of atomic_xchg, and making it easier to detect if the wrong unlock function was previously used. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: dri-devel@lists.freedesktop.org Cc: linaro-mm-sig@lists.linaro.org Cc: robclark@gmail.com Cc: rostedt@goodmis.org Cc: daniel@ffwll.ch Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20130620113105.4001.83929.stgit@patser Signed-off-by: Ingo Molnar <mingo@kernel.org> commit 2bd2c92cf07cc4a373bf316c75b78ac465fefd35 Author: Waiman Long <Waiman.Long@hp.com> Date: Wed Apr 17 15:23:13 2013 -0400 mutex: Queue mutex spinners with MCS lock to reduce cacheline contention <-- snip --> commit 41fcb9f230bf773656d1768b73000ef720bf00c3 Author: Waiman Long <Waiman.Long@hp.com> Date: Wed Apr 17 15:23:11 2013 -0400 mutex: Move mutex spinning code from sched/core.c back to mutex.c <-- snip --> commit c5491ea779793f977d282754db478157cc409d82 Author: Thomas Gleixner <tglx@linutronix.de> Date: Mon Mar 21 12:09:35 2011 +0100 sched/rt: Add schedule_preempt_disabled() <-- snip --> Cc: maarten.lankhorst@canonical.com Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Rob Clark <robdclark@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: dri-devel@lists.freedesktop.org Cc: linaro-mm-sig@lists.linaro.org Cc: rostedt@goodmis.org Cc: daniel@ffwll.ch Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-29backports: enable kconfig language on dependencies fileLuis R. Rodriguez
Certain complex features that are backported may be be limitted to a certain target build configuration. An example can be if a backported feature is not yet backported with support for lockdep. In order to avoid build failures with these types of restrictions allow for specifying build configuration dependencies on backported upstream kconfig symbols other than just kernel versioning contstraints. This adds support for specifying upstream kconfig constaints other than kernel versioning by adding kconfig language extensions on the dependencies file. This will update the copied over upstream Kconfig file for the symbol specified with the kconfig constraints specified. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-27backports: backport of_get_child_by_name() supportLuis R. Rodriguez
This was added via 9c19761a. While at it clean up the backported header a bit to make backporting more OF stuff more manageable. mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains 9c19761a v3.7-rc1~123^2~4 commit 9c19761a7ecdc86abb2fba0feb81e8952eccc1f1 Author: Srinivas Kandagatla <srinivas.kandagatla@st.com> Date: Tue Sep 18 08:10:28 2012 +0100 dt: introduce of_get_child_by_name to get child node by name This patch introduces of_get_child_by_name function to get a child node by its name in a given parent node. Without this patch each driver code has to iterate the parent and do a string compare, However having of_get_child_by_name libary function would avoid code duplication, errors and is more convenient. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com> Signed-off-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-27backports: copy over mfd/max8998.h mfd/max8998-private.hLuis R. Rodriguez
This is required by CONFIG_REGULATOR_MAX8998 which builds drivers/regulator/max8998.c as of next-20130703. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-23backport: disable unused automatic backportsJohannes Berg
When an automatic backport isn't included due to not being used (see commit 6e0475b599217eceb8e01a1e572c, "gentree: add automatic backports only if needed"), selecting BACKPORT_USERSEL_BUILD_ALL will make the build fail. Avoid this by disabling such symbols in the Kconfig. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-23backports: fix DMI_EXACT_MATCH() backportLuis R. Rodriguez
DMI_EXACT_MATCH uses struct dmi_strmatch's new member exact_match: @@ -456,7 +456,8 @@ enum dmi_field { }; struct dmi_strmatch { - unsigned char slot; + unsigned char slot:7; + unsigned char exact_match:1; char substr[79]; }; Prior to 5017b285 we only had slot so to use DMI_EXACT_MATCH with its intent we'd have to do something like slot |= 1 if its called. This however assumes though that older code has the sanity check as changed in 5017b285 on drivers/firmware/dmi_scan.c. dmi_scan.o gets linked with CONFIG_DMI. At least for x86 that gets objects sprinkled on arch/x86/, but more importantly CONFIG_DMI is bool. I've argued how I envision us being able to backport core components before (see 0935deab for the hint) but as it is right now we can't. We only backport things we can throw in as modular. Since we only backport modularly for now we can't backport DMI_EXACT_MATCH() and as such all entries defined with DMI_EXACT_MATCH() should be ifdef'd out for usage only on kernels >= v3.11 but to help reduce code churn we can also just force such entries to be ignored for now. We therefore backport DMI_EXACT_MATCH() for now to match something that will not be found. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-23backports: fix wq_name_list initializationLuis R. Rodriguez
As noted by Johannes this wasn't being initialized without this. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-23backports: simplify space regexp for src_lineLuis R. Rodriguez
The regexp doesn't require the extra brackets. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backports: lib/kconfig.py - fix src line regexpLuis R. Rodriguez
The source line can be prefixed by spaces and tabs. Without this a slew of kconfig options were not being parsed for dependency checking and at compile time they'd obviously fail. Tested with ckmake against next-20130627 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] real 34m5.379s user 921m5.112s sys 128m8.156s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backports: enable REGULATOR_MAX77693 on >= 3.6Luis R. Rodriguez
There is a symbol missing otherwise that is currently only provided by the core, ie, non modular. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backports: add clock enable/disable on soc_camera_power_[on|off]()Luis R. Rodriguez
v4l2-core now supports enabling and disabling its own clock on turning the camera on / off. We backport v4l2-core fully so just backport the soc calls appropriately to let SOC cameras to turn the clock on / off when the v4l2-core clock ops are implemented on a device driver. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backports: revert DMI_EXACT_MATCH() for older kernelsLuis R. Rodriguez
struct dmi_strmatch was modified on v3.11 with a exact_match member. The DMI_EXACT_MATCH() macro was added as a mod version of DMI_MATCH() to account for dmi strings that look closely like each other. An example is D510MO Vs D510MOV. Since exact_match is is not available on older kernels we can't use it and must revert to the old DMI_MATCH(). Addressing the desired behaviour will require a separate change to deal with addressing the difference in the behaviour. Chris Wilson recommends that if we can't use this we should also rever the DMI related fixes. I believe these are: dcf6d294830d46b0e6901477fb4bf455281d90c8 - drm/i915: quirk away phantom LVDS on Intel's D525MW mainboard e5614f0c2d0f4d7f0b8ef745d34593baf2c5dbf8 - drm/i915: quirk away phantom LVDS on Intel's D510MO mainboard Once we get confirmation we can do that. Proof of why we can't backport DMI_EXACT_MATCH(): DMI_EXACT_MATCH uses struct dmi_strmatch's new member exact_match: @@ -456,7 +456,8 @@ enum dmi_field { }; struct dmi_strmatch { - unsigned char slot; + unsigned char slot:7; + unsigned char exact_match:1; char substr[79]; }; Prior to 5017b285 we only had slot member so to use DMI_EXACT_MATCH() with its intent we'd have to do something like: slot |= 1 if its called. This however assumes though that older code has the sanity check as changed in 5017b285 on drivers/firmware/dmi_scan.c. dmi_scan.o gets linked with CONFIG_DMI. At least for x86 that gets objects sprinkled on arch/x86/, but more importantly CONFIG_DMI is bool. I've argued how I envision us being able to backport core components before (see 0935deab for the hint) but as it is right now we can't. We only backport things we can throw in as modular. mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains 5017b285 v3.11-rc1~99^2~254 commit 5017b2851373ee15c7035151853bb1448800cae2 Author: Jani Nikula <jani.nikula@intel.com> Date: Wed Jul 3 15:05:02 2013 -0700 dmi: add support for exact DMI matches in addition to substring matching dmi_match() considers a substring match to be a successful match. This is not always sufficient to distinguish between DMI data for different systems. Add support for exact string matching using strcmp() in addition to the substring matching using strstr(). The specific use case in the i915 driver is to allow us to use an exact match for D510MO, without also incorrectly matching D510MOV: { .ident = "Intel D510MO", .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "Intel"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "D510MO"), }, } Signed-off-by: Jani Nikula <jani.nikula@intel.com> Cc: <annndddrr@gmail.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Cornel Panceac <cpanceac@gmail.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: jani.nikula@intel.com Cc: annndddrr@gmail.com Cc: chris@chris-wilson.co.uk Cc: cpanceac@gmail.com Cc: daniel.vetter@ffwll.ch Cc: greg@kroah.com Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backports: copy the max77693-private.h header fileLuis R. Rodriguez
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backports: simplify swiotlb_nr_tbl() backportLuis R. Rodriguez
swiotlb_nr_tbl() was available since 3.2 but was exported since 3.3. Since it uses an internal global state variable, it is impossible to backport it to. Instead of reverting the changes added just let this return 0 as the code will not do anything. This simplifies the backport. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backports: refresh patches for next-20130627Luis R. Rodriguez
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backports: fix patches required for next-20130627Luis R. Rodriguez
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
2013-07-19backport: backport sprintf-style workqueue namingJohannes Berg
Since kernel version 3.3, workqueue names could be sprintf'ed instead of just pointing to a name. This wasn't used a lot so never needed to be backported, but now it's used everywhere. Backport this API. Signed-off-by: Johannes Berg <johannes.berg@intel.com> [mcgrof: add WQ_HIGHPRI and WQ_MEM_RECLAIM defines] Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>