Re: patch INP3 for kernel 3.6

Re: patch INP3 for kernel 3.6

[Waldek]

Hi Matt,
 
I have try use this patch in 3.6.11 kernel:
patching file include/linux/netrom.h
Hunk #1 succeeded at 18 (offset 2 lines).
patching file include/net/netrom.h
Hunk #1 FAILED at 9.
Hunk #2 succeeded at 38 (offset 1 line).
Hunk #3 succeeded at 67 (offset 1 line).
Hunk #4 succeeded at 106 (offset 1 line).
Hunk #5 succeeded at 127 (offset 1 line).
Hunk #6 succeeded at 231 (offset 1 line).
Hunk #7 succeeded at 296 (offset 1 line).
1 out of 7 hunks FAILED -- saving rejects to file include/net/netrom.h.rej
patching file net/ax25/Kconfig
patching file net/netrom/af_netrom.c
Hunk #2 succeeded at 1252 with fuzz 2 (offset -3 lines).
Hunk #3 succeeded at 1441 (offset -18 lines).
Hunk #4 succeeded at 1476 (offset -18 lines).
Hunk #5 succeeded at 1508 (offset -18 lines).
patching file net/netrom/inp3.c
patching file net/netrom/Makefile
patching file net/netrom/nr_route.c
Hunk #2 succeeded at 41 (offset 1 line).
Hunk #3 succeeded at 69 (offset 1 line).
Hunk #4 succeeded at 94 (offset 1 line).
Hunk #5 succeeded at 132 (offset 1 line).
Hunk #6 succeeded at 163 (offset 1 line).
Hunk #7 succeeded at 185 (offset 1 line).
Hunk #8 succeeded at 230 (offset 1 line).
Hunk #9 succeeded at 279 with fuzz 2 (offset 1 line).
Hunk #10 succeeded at 342 (offset 4 lines).
Hunk #11 succeeded at 370 (offset 4 lines).
Hunk #12 succeeded at 415 (offset 4 lines).
Hunk #13 succeeded at 456 (offset 4 lines).
Hunk #14 succeeded at 504 (offset 4 lines).
Hunk #15 succeeded at 549 (offset 4 lines).
Hunk #16 succeeded at 560 (offset 4 lines).
Hunk #17 succeeded at 579 (offset 4 lines).
Hunk #18 succeeded at 617 (offset 5 lines).
Hunk #19 succeeded at 690 (offset 5 lines).
Hunk #20 succeeded at 897 (offset 9 lines).
Hunk #21 succeeded at 912 (offset 9 lines).
Hunk #22 succeeded at 944 (offset 9 lines).
Hunk #23 succeeded at 954 (offset 9 lines).
Hunk #24 succeeded at 973 (offset 9 lines).
Hunk #25 succeeded at 1004 (offset 9 lines).
 
 
and display rejected netrom.h:
 
include/net$ more netrom.h.rej 
*** include/net/netrom.h2012-09-23 05:24:40.000000000 +1000
--- include/net/netrom.h2012-12-14 17:00:59.000000000 +1100
***************
*** 9,14 ****
  
  #include <linux/netrom.h>
  #include <linux/list.h>
  #include <net/sock.h>
  
  #defineNR_NETWORK_LEN15
--- 9,15 ----
  
  #include <linux/netrom.h>
  #include <linux/list.h>
+ #include <linux/types.h>
  #include <net/sock.h>
  
  #defineNR_NETWORK_LEN15
 

Re: patch INP3 for kernel 3.6

[Matt Maguire]

I'm not surprised it doesn't apply cleanly -- it is for 2.6 kernel,
not 3.6. Even if it did apply, I wouldn't use it until the deadlock
issue is addressed -- that's why I was interested to hear that someone
else made a patch for 2.6, as I am curious whether they also fixed the
deadlock issue inherited from the 2.4 patch.

73,
Matt VK2RQ

On Thu, Sep 26, 2013 at 6:02 PM, Waldek <sp2ong@wp.pl> wrote:
>
> Hi Matt,
>
> I have try use this patch in 3.6.11 kernel:
> patching file include/linux/netrom.h
> Hunk #1 succeeded at 18 (offset 2 lines).
> patching file include/net/netrom.h
> Hunk #1 FAILED at 9.
> Hunk #2 succeeded at 38 (offset 1 line).
> Hunk #3 succeeded at 67 (offset 1 line).
> Hunk #4 succeeded at 106 (offset 1 line).
> Hunk #5 succeeded at 127 (offset 1 line).
> Hunk #6 succeeded at 231 (offset 1 line).
> Hunk #7 succeeded at 296 (offset 1 line).
> 1 out of 7 hunks FAILED -- saving rejects to file include/net/netrom.h.rej
> patching file net/ax25/Kconfig
> patching file net/netrom/af_netrom.c
> Hunk #2 succeeded at 1252 with fuzz 2 (offset -3 lines).
> Hunk #3 succeeded at 1441 (offset -18 lines).
> Hunk #4 succeeded at 1476 (offset -18 lines).
> Hunk #5 succeeded at 1508 (offset -18 lines).
> patching file net/netrom/inp3.c
> patching file net/netrom/Makefile
> patching file net/netrom/nr_route.c
> Hunk #2 succeeded at 41 (offset 1 line).
> Hunk #3 succeeded at 69 (offset 1 line).
> Hunk #4 succeeded at 94 (offset 1 line).
> Hunk #5 succeeded at 132 (offset 1 line).
> Hunk #6 succeeded at 163 (offset 1 line).
> Hunk #7 succeeded at 185 (offset 1 line).
> Hunk #8 succeeded at 230 (offset 1 line).
> Hunk #9 succeeded at 279 with fuzz 2 (offset 1 line).
> Hunk #10 succeeded at 342 (offset 4 lines).
> Hunk #11 succeeded at 370 (offset 4 lines).
> Hunk #12 succeeded at 415 (offset 4 lines).
> Hunk #13 succeeded at 456 (offset 4 lines).
> Hunk #14 succeeded at 504 (offset 4 lines).
> Hunk #15 succeeded at 549 (offset 4 lines).
> Hunk #16 succeeded at 560 (offset 4 lines).
> Hunk #17 succeeded at 579 (offset 4 lines).
> Hunk #18 succeeded at 617 (offset 5 lines).
> Hunk #19 succeeded at 690 (offset 5 lines).
> Hunk #20 succeeded at 897 (offset 9 lines).
> Hunk #21 succeeded at 912 (offset 9 lines).
> Hunk #22 succeeded at 944 (offset 9 lines).
> Hunk #23 succeeded at 954 (offset 9 lines).
> Hunk #24 succeeded at 973 (offset 9 lines).
> Hunk #25 succeeded at 1004 (offset 9 lines).
>
>
> and display rejected netrom.h:
>
> include/net$ more netrom.h.rej
> *** include/net/netrom.h2012-09-23 05:24:40.000000000 +1000
> --- include/net/netrom.h2012-12-14 17:00:59.000000000 +1100
> ***************
> *** 9,14 ****
>
>   #include <linux/netrom.h>
>   #include <linux/list.h>
>   #include <net/sock.h>
>
>   #defineNR_NETWORK_LEN15
> --- 9,15 ----
>
>   #include <linux/netrom.h>
>   #include <linux/list.h>
> + #include <linux/types.h>
>   #include <net/sock.h>
>
>   #defineNR_NETWORK_LEN15
>
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-hams" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html