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;
Date:   Sun, 22 Mar 2020 17:02:58 +0000
From:   Jonathan Cameron <jic23@kernel.org>
To:     Lars-Peter Clausen <lars@metafoo.de>
Cc:     "Ardelean, Alexandru" <alexandru.Ardelean@analog.com>,
        "ardeleanalex@gmail.com" <ardeleanalex@gmail.com>,
        "andriy.shevchenko@linux.intel.com" 
        <andriy.shevchenko@linux.intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>
Subject: Re: [PATCH] iio: buffer: re-introduce bitmap_zalloc() for trialmask
Message-ID: <20200322170258.3abd9454@archlinux>
In-Reply-To: <46516126-d22f-4bf8-a711-8218277d69f1@metafoo.de>
References: <20200317123621.27722-1-alexandru.ardelean@analog.com>
        <20200317125223.GC1922688@smile.fi.intel.com>
        <cb09b6f882a786a74919eda8812f27d502363150.camel@analog.com>
        <46516126-d22f-4bf8-a711-8218277d69f1@metafoo.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, 17 Mar 2020 14:18:43 +0100
Lars-Peter Clausen <lars@metafoo.de> wrote:

> On 3/17/20 1:53 PM, Ardelean, Alexandru wrote:
> > On Tue, 2020-03-17 at 14:52 +0200, Andy Shevchenko wrote: =20
> >> [External]
> >>
> >> On Tue, Mar 17, 2020 at 02:36:21PM +0200, Alexandru Ardelean wrote: =20
> >>> Commit 3862828a903d3 ("iio: buffer: Switch to bitmap_zalloc()") intro=
duced
> >>> bitmap_alloc(), but commit 20ea39ef9f2f9 ("iio: Fix scan mask selecti=
on")
> >>> 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. =20
> >>
> >> FWIW,
> >> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> =20
> >=20
> > Thanks.
> > And sorry for the hiccup back there. =20
>=20
> It looks like a merge conflict. Both patches are in parallel sub-trees.=20
> I guess one went through fixes and the other through the normal tree and=
=20
> then when they were merged, the issue was not resolved properly.
>=20
> 2019-04-21 Greg Kroah-Hartman   M=E2=94=80=E2=94=90 Merge 5.1-rc6 into st=
aging-next
> 2019-02-20 Lars-Peter Clausen   =E2=94=82 o iio: Fix scan mask selection
> 2019-03-04 Andy Shevchenko      o =E2=94=82 iio: buffer: Switch to bitmap=
_zalloc
> 2018-02-20 Greg Kroah-Hartman   M=E2=94=80=E2=94=A4 Merge tag 'iio-fixes-=
for-4.16a

Thanks for the detective work. I've added a note to the patch description.

Jonathan