lkml.org 
[lkml]   [2020]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] iio: buffer: re-introduce bitmap_zalloc() for trialmask
From
Date
On 3/17/20 1:53 PM, Ardelean, Alexandru wrote:
> On Tue, 2020-03-17 at 14:52 +0200, Andy Shevchenko wrote:
>> [External]
>>
>> On Tue, Mar 17, 2020 at 02:36:21PM +0200, Alexandru Ardelean wrote:
>>> Commit 3862828a903d3 ("iio: buffer: Switch to bitmap_zalloc()") introduced
>>> bitmap_alloc(), but commit 20ea39ef9f2f9 ("iio: Fix scan mask selection")
>>> reverted it.
>>>
>>> This change adds it back. The only difference is that it's adding
>>> bitmap_zalloc(). There might be some changes later that would require
>>> initializing it to zero. In any case, now it's already zero-ing the
>>> trialmask.
>>
>> FWIW,
>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Thanks.
> And sorry for the hiccup back there.

It looks like a merge conflict. Both patches are in parallel sub-trees.
I guess one went through fixes and the other through the normal tree and
then when they were merged, the issue was not resolved properly.

2019-04-21 Greg Kroah-Hartman M─┐ Merge 5.1-rc6 into staging-next
2019-02-20 Lars-Peter Clausen │ o iio: Fix scan mask selection
2019-03-04 Andy Shevchenko o │ iio: buffer: Switch to bitmap_zalloc
2018-02-20 Greg Kroah-Hartman M─┤ Merge tag 'iio-fixes-for-4.16a

\
 
 \ /
  Last update: 2020-03-17 14:20    [W:0.062 / U:0.856 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site