Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] iio: buffer: re-introduce bitmap_zalloc() for trialmask
To:     "Ardelean, Alexandru" <alexandru.Ardelean@analog.com>,
        "ardeleanalex@gmail.com" <ardeleanalex@gmail.com>,
        "andriy.shevchenko@linux.intel.com" 
        <andriy.shevchenko@linux.intel.com>
Cc:     "jic23@kernel.org" <jic23@kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
References: <20200317123621.27722-1-alexandru.ardelean@analog.com>
 <20200317125223.GC1922688@smile.fi.intel.com>
 <cb09b6f882a786a74919eda8812f27d502363150.camel@analog.com>
From:   Lars-Peter Clausen <lars@metafoo.de>
Message-ID: <46516126-d22f-4bf8-a711-8218277d69f1@metafoo.de>
Date:   Tue, 17 Mar 2020 14:18:43 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.5.0
MIME-Version: 1.0
In-Reply-To: <cb09b6f882a786a74919eda8812f27d502363150.camel@analog.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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