patch "iio: adc: meson-saradc: use NULL instead of 0 for pointer" added to staging-testing
martin.blumenstingl at googlemail.com
Wed Jun 28 13:12:31 PDT 2017
On Tue, Jun 27, 2017 at 8:43 AM, Greg KH <gregkh at linuxfoundation.org> wrote:
> On Mon, Jun 26, 2017 at 08:57:18PM +0200, Martin Blumenstingl wrote:
>> Hi Greg, Hi Jonathan,
>> On Mon, Jun 26, 2017 at 7:09 AM, <gregkh at linuxfoundation.org> wrote:
>> > This is a note to let you know that I've just added the patch titled
>> > iio: adc: meson-saradc: use NULL instead of 0 for pointer
>> > to my staging git tree which can be found at
>> > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
>> > in the staging-testing branch.
>> > The patch will show up in the next release of the linux-next tree
>> > (usually sometime within the next 24 hours during the week.)
>> > The patch will be merged to the staging-next branch sometime soon,
>> > after it passes testing, and the merge window is open.
>> > If you have any questions about this process, please let me know.
>> is there a way to drop below patch from your repo?
>> during testing I found out that the code before and after this patch
>> leads to a NULL deref. I provided a fix (see ) which solves the
>> crash and the warning as reported by Paolo - and that fix is already
>> part of v4.12-rc6
>> so the patch below will cause a merge conflict
> I already handled the merge conflict, can you verify I got it right in
> my tree?
I just checked your staging.git/staging-testing branch: it seems that
the conflict was resolved correctly (meaning that Paolo's patch is
non-existent in your tree, which is correct)
More information about the linux-amlogic