[PATCH] backports: update devcoredump patch

[PATCH] backports: update devcoredump patch

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

Changed upstream by commit 522566376a3f ("devcoredump:
add scatterlist support").

Change-Id: I9a8e933ed70ac85ebc0c241a3faa78217fbb6f30
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 patches/backport-adjustments/devcoredump.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/backport-adjustments/devcoredump.patch b/patches/backport-adjustments/devcoredump.patch
index b438f32e115b..efa5d9f9ab48 100644
--- a/patches/backport-adjustments/devcoredump.patch
+++ b/patches/backport-adjustments/devcoredump.patch
@@ -103,12 +103,12 @@
  
 -#ifdef CONFIG_DEV_COREDUMP
 +#ifdef CPTCFG_BPAUTO_WANT_DEV_COREDUMP
- void dev_coredumpv(struct device *dev, const void *data, size_t datalen,
+ void dev_coredumpv(struct device *dev, void *data, size_t datalen,
  		   gfp_t gfp);
  
 @@ -30,6 +30,6 @@ dev_coredumpm(struct device *dev, struct
  {
- 	free(data);
+ 	_devcd_free_sgtable(table);
  }
 -#endif /* CONFIG_DEV_COREDUMP */
 +#endif /* CPTCFG_BPAUTO_WANT_DEV_COREDUMP */
-- 
2.8.0.rc3

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

Re: [PATCH] backports: update devcoredump patch

[Johannes Berg]

On Tue, 2016-05-31 at 15:49 +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> Changed upstream by commit 522566376a3f ("devcoredump:
> add scatterlist support").
> 
This isn't working.

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

Re: [PATCH] backports: update devcoredump patch

[Arend Van Spriel]

On 31-5-2016 16:03, Johannes Berg wrote:
> On Tue, 2016-05-31 at 15:49 +0200, Johannes Berg wrote:
>> From: Johannes Berg <johannes.berg@intel.com>
>>
>> Changed upstream by commit 522566376a3f ("devcoredump:
>> add scatterlist support").
>>
> This isn't working.

You already have something that is working? Otherwise, I have to dive in
to fix my nightly builds.

Gr. AvS
--
To unsubscribe from this list: send the line "unsubscribe backports" in

Re: [PATCH] backports: update devcoredump patch

[Johannes Berg]

> You already have something that is working? Otherwise, I have to dive
> in to fix my nightly builds.
> 

Don't know if you got my other mail - at least the list seems to have
rejected it.

No, I don't really - this one was giving compiler warnings. I *think*
that was because it simply didn't work, but I'm not entirely sure.

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

Re: [PATCH] backports: update devcoredump patch

[Arend van Spriel]

On 03-06-16 20:48, Johannes Berg wrote:
> 
>> You already have something that is working? Otherwise, I have to dive
>> in to fix my nightly builds.
>>
> 
> Don't know if you got my other mail - at least the list seems to have
> rejected it.

I think I got it around 11am.

> No, I don't really - this one was giving compiler warnings. I *think*
> that was because it simply didn't work, but I'm not entirely sure.

I guess I could take your patch as I only need it to build but have to
remove -Werror option for that. My nightly testing does not invoke the
devcoredump explicitly. It will when our 802.11 psm hangs.

Regards,
Arend
--
To unsubscribe from this list: send the line "unsubscribe backports" in

Re: [PATCH] backports: update devcoredump patch

[Johannes Berg]

> I guess I could take your patch as I only need it to build but have
> to remove -Werror option for that. My nightly testing does not invoke
> the devcoredump explicitly. It will when our 802.11 psm hangs.
> 

Well, then you don't really need to do anything - the only problem
would be with drivers that need the new method (none yet); the compiler
warning about the prototype mismatch is actually harmless (a function
that used to take a "const void *" now gets a "void *")

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

Re: [PATCH] backports: update devcoredump patch

[Arend Van Spriel]

On Fri, Jun 3, 2016 at 8:57 PM, Johannes Berg <johannes@sipsolutions.net> wrote:
>
>> I guess I could take your patch as I only need it to build but have
>> to remove -Werror option for that. My nightly testing does not invoke
>> the devcoredump explicitly. It will when our 802.11 psm hangs.
>>
>
> Well, then you don't really need to do anything - the only problem
> would be with drivers that need the new method (none yet); the compiler
> warning about the prototype mismatch is actually harmless (a function
> that used to take a "const void *" now gets a "void *")

That might be true, but I still get error below preparing the backports package:

Failed to apply changes from backport-adjustments/devcoredump.patch
> patching file compat/drivers-base-devcoredump.c
> Hunk #1 succeeded at 31 (offset 1 line).
> Hunk #2 succeeded at 41 with fuzz 1 (offset 1 line).
> Hunk #3 succeeded at 74 (offset 1 line).
> Hunk #4 succeeded at 86 (offset 1 line).
> Hunk #5 succeeded at 122 (offset 1 line).
> Hunk #6 succeeded at 134 (offset 1 line).
> Hunk #7 succeeded at 179 (offset 1 line).
> Hunk #8 succeeded at 325 (offset 44 lines).
> Hunk #9 succeeded at 372 with fuzz 2 (offset 65 lines).
> patching file include/linux/backport-devcoredump.h
> Hunk #1 FAILED at 5.
> Hunk #2 succeeded at 100 with fuzz 2 (offset 70 lines).
> 1 out of 2 hunks FAILED -- saving rejects to file include/linux/backport-devcoredump.h.rej

Regards,
Arend
--
To unsubscribe from this list: send the line "unsubscribe backports" in