Re: [PULL] First round of new device support, cleanups and fixes for IIO in the 5.2 cycle.

[Jonathan Cameron <jonathan.cameron@huawei.com>]

On Tue, 2 Apr 2019 09:14:52 +0200
Greg KH <gregkh@linuxfoundation.org> wrote:

> On Mon, Apr 01, 2019 at 10:04:07PM +0100, Jonathan Cameron wrote:
> > Hi Greg,
> > 
> > There is a merge conflict in here against the previous fixes branch
> > in industrialio-buffer.c.  The resolution I would suggest is to take
> > the cleanup from Andy that is in this branch that moves the
> > code over to bitmap_kzalloc avoiding the issue that was fixed in
> > the other branch.  I'd not noticed this one sneaking in until I
> > did a test merge a few minutes ago. Sorry about that.
> > 
> > Thanks for your help (for this and in general!)  
> 
> Odd, all I had merge problems with was drivers/iio/adc/stmpe-adc.c due
> to a patch that was in my tree already for it.
> 
> I do have a bunch of "signed-off-by not present warnings" in your tree,
> when I try to do this merge:
> 
> Commit ddb27e1bf24c8db0a8803201aa46b9d26cc815ff
>         committer SOB missing
>         stefan@agner.ch Jonathan.Cameron@huawei.com
>         Signed-off-by: Stefan Agner <stefan@agner.ch>
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Commit e909fb9e1beec6968ad7dda3081556526a641ea3
>         committer SOB missing
>         stefan@agner.ch Jonathan.Cameron@huawei.com
>         Signed-off-by: Stefan Agner <stefan@agner.ch>
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Commit 8af18b62c593560c7ce360244fb47be27bb50a32
>         committer SOB missing
>         philippe.schenker@toradex.com Jonathan.Cameron@huawei.com
>         Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Commit d848b89bae04ade886320367f510d9f64c3a6e20
>         committer SOB missing
>         stefan@agner.ch Jonathan.Cameron@huawei.com
>         Signed-off-by: Stefan Agner <stefan@agner.ch>
> Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Commit ac7358ded6a5f1b6bf29031301bb9f774bf05372
>         committer SOB missing
>         philippe.schenker@toradex.com Jonathan.Cameron@huawei.com
>         Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Commit 0af69b0a78eac5a7041674be1736929a91758256
>         committer SOB missing
>         philippe.schenker@toradex.com Jonathan.Cameron@huawei.com
>         Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Commit 6c038d0bded5da24f13c509de7f47aba58a3bfc1
>         author SOB missing
>         c.cantanheide@gmail.com Jonathan.Cameron@huawei.com
>         Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Errors in tree with signed-off-by, please fix!
> 
> Which is a bunch of errors :(
> 
> Can you fix these up for those that you can (i.e. the committers not
> signing off) and for those patches from authors without a s-o-b at all,
> we need that before we can take those.

Will do, I think I know what happened here.  I must have rebased across the
merge to add a tag and not noticed.  So those are actually committed by Lee
but I broke my history.

I'll sort out the mess and I completely missed the author one. Sorry about
that.  Will drop that one until sorted.

Jonathan

> 
> thanks,
> 
> greg k-h