diff mbox

Failed to backport from from Linux 4.4 drivers to Linux 3.10.108

Message ID d54cd7c5-fb33-59dc-afd0-d48f36a7a06d@gmail.com (mailing list archive)
State Rejected
Headers show

Commit Message

Masashi Honma May 9, 2018, 8:51 a.m. UTC
On 2018/05/09 17:12, Johannes Berg wrote:
> Though of course this doesn't apply to the older branches :)

How about setting upper limitation to the older branches by attached patch ?

Masashi Honma.

Comments

Johannes Berg May 9, 2018, 9:03 a.m. UTC | #1
On Wed, 2018-05-09 at 17:51 +0900, Masashi Honma wrote:
> On 2018/05/09 17:12, Johannes Berg wrote:
> > Though of course this doesn't apply to the older branches :)
> 
> How about setting upper limitation to the older branches by attached patch ?

We could also cherry-pick my trivial patch to the older branches I
guess. That'd still be simpler?

johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
Masashi Honma May 9, 2018, 9:24 a.m. UTC | #2
On 2018/05/09 18:03, Johannes Berg wrote:
> We could also cherry-pick my trivial patch to the older branches I
> guess. That'd still be simpler?

Oh, you already have a plan.
Then drop my plan.

Masashi Honma.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
Johannes Berg May 9, 2018, 9:25 a.m. UTC | #3
On Wed, 2018-05-09 at 18:24 +0900, Masashi Honma wrote:
> On 2018/05/09 18:03, Johannes Berg wrote:
> > We could also cherry-pick my trivial patch to the older branches I
> > guess. That'd still be simpler?
> 
> Oh, you already have a plan.
> Then drop my plan.

Well, I wasn't really planning on doing it, but I could? :)

I guess it's easy enough though.

johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
Steve deRosier May 9, 2018, 2:19 p.m. UTC | #4
On Wed, May 9, 2018 at 2:25 AM Johannes Berg <johannes@sipsolutions.net>
wrote:

> On Wed, 2018-05-09 at 18:24 +0900, Masashi Honma wrote:
> > On 2018/05/09 18:03, Johannes Berg wrote:
> > > We could also cherry-pick my trivial patch to the older branches I
> > > guess. That'd still be simpler?
> >
> > Oh, you already have a plan.
> > Then drop my plan.

> Well, I wasn't really planning on doing it, but I could? :)

> I guess it's easy enough though.


That'd be my vote.

I haven't looked at the docs in a long time - do we note a minimum required
version of coccinelle?

- Steve
--
To unsubscribe from this list: send the line "unsubscribe backports" in
Arend van Spriel May 9, 2018, 6:49 p.m. UTC | #5
On 5/9/2018 4:19 PM, Steve deRosier wrote:
> On Wed, May 9, 2018 at 2:25 AM Johannes Berg <johannes@sipsolutions.net>
> wrote:
>
>> On Wed, 2018-05-09 at 18:24 +0900, Masashi Honma wrote:
>>> On 2018/05/09 18:03, Johannes Berg wrote:
>>>> We could also cherry-pick my trivial patch to the older branches I
>>>> guess. That'd still be simpler?
>>>
>>> Oh, you already have a plan.
>>> Then drop my plan.
>
>> Well, I wasn't really planning on doing it, but I could? :)
>
>> I guess it's easy enough though.
>
>
> That'd be my vote.
>
> I haven't looked at the docs in a long time - do we note a minimum required
> version of coccinelle?

Do we have docs :-p Anyway, the gentree script checks the spatch version 
and seems Johannes already took care of the script as well [1]

Gr. AvS

[1] 
https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git/commit/?id=98272f479c2126a135dfcb12484e93d5888164ab

--
To unsubscribe from this list: send the line "unsubscribe backports" in
Johannes Berg May 9, 2018, 7:27 p.m. UTC | #6
On Wed, 2018-05-09 at 20:49 +0200, Arend van Spriel wrote:
> 
> Do we have docs :-p Anyway, the gentree script checks the spatch version 
> and seems Johannes already took care of the script as well [1]

Yeah I didn't apply it to any other branches though.

johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
diff mbox

Patch

diff --git a/lib/bpreqs.py b/lib/bpreqs.py
index 1325fd2..feef444 100644
--- a/lib/bpreqs.py
+++ b/lib/bpreqs.py
@@ -190,10 +190,11 @@  class Req:
         sys.stdout.write("Try installing the package: %s\n" % package_hint)
         return False
     def coccinelle(self, version):
-        if self.require_version('spatch', '--version', version, 2, self.linux_version_cmp):
+        if self.linux_version_cmp('1.0.6', self.req_get_prog_version('spatch', '--version', 2)) == -1 and \
+           self.require_version('spatch', '--version', version, 2, self.linux_version_cmp):
             return True
         sys.stdout.write("Try installing the package: coccinelle\n")
-        sys.stdout.write("If that is too old go grab the code from source:\n\n")
+        sys.stdout.write("If that is less than " + version + " or more than 1.0.6 go grab the code from source:\n\n")
         sys.stdout.write("git clone https://github.com/coccinelle/coccinelle.git\n\n")
         sys.stdout.write("To build you will need: ocaml ncurses-devel\n\n")
         sys.stdout.write("If on SUSE / OpenSUSE you will also need: ocaml-ocamldoc\n\n")