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
Date: Sun, 22 Mar 2020 17:02:58 +0000 [thread overview]
Message-ID: <20200322170258.3abd9454@archlinux> (raw)
In-Reply-To: <46516126-d22f-4bf8-a711-8218277d69f1@metafoo.de>
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:
> >> [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
Thanks for the detective work. I've added a note to the patch description.
Jonathan
next prev parent reply other threads:[~2020-03-22 17:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 12:36 [PATCH] iio: buffer: re-introduce bitmap_zalloc() for trialmask Alexandru Ardelean
2020-03-17 12:52 ` Andy Shevchenko
2020-03-17 12:53 ` Ardelean, Alexandru
2020-03-17 13:18 ` Lars-Peter Clausen
2020-03-22 17:02 ` Jonathan Cameron [this message]
2020-03-21 8:59 ` [PATCH v2] " Alexandru Ardelean
2020-03-22 17:01 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200322170258.3abd9454@archlinux \
--to=jic23@kernel.org \
--cc=alexandru.Ardelean@analog.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=ardeleanalex@gmail.com \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).