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@xxxxxxxx Jonathan.Cameron@xxxxxxxxxx
Signed-off-by: Stefan Agner <stefan@xxxxxxxx>
Signed-off-by: Max Krummenacher <max.krummenacher@xxxxxxxxxxx>
Signed-off-by: Philippe Schenker <philippe.schenker@xxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Commit e909fb9e1beec6968ad7dda3081556526a641ea3
committer SOB missing
stefan@xxxxxxxx Jonathan.Cameron@xxxxxxxxxx
Signed-off-by: Stefan Agner <stefan@xxxxxxxx>
Signed-off-by: Max Krummenacher <max.krummenacher@xxxxxxxxxxx>
Signed-off-by: Philippe Schenker <philippe.schenker@xxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Commit 8af18b62c593560c7ce360244fb47be27bb50a32
committer SOB missing
philippe.schenker@xxxxxxxxxxx Jonathan.Cameron@xxxxxxxxxx
Signed-off-by: Philippe Schenker <philippe.schenker@xxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Commit d848b89bae04ade886320367f510d9f64c3a6e20
committer SOB missing
stefan@xxxxxxxx Jonathan.Cameron@xxxxxxxxxx
Signed-off-by: Stefan Agner <stefan@xxxxxxxx>
Signed-off-by: Max Krummenacher <max.krummenacher@xxxxxxxxxxx>
Signed-off-by: Philippe Schenker <philippe.schenker@xxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Commit ac7358ded6a5f1b6bf29031301bb9f774bf05372
committer SOB missing
philippe.schenker@xxxxxxxxxxx Jonathan.Cameron@xxxxxxxxxx
Signed-off-by: Philippe Schenker <philippe.schenker@xxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Commit 0af69b0a78eac5a7041674be1736929a91758256
committer SOB missing
philippe.schenker@xxxxxxxxxxx Jonathan.Cameron@xxxxxxxxxx
Signed-off-by: Philippe Schenker <philippe.schenker@xxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Commit 6c038d0bded5da24f13c509de7f47aba58a3bfc1
author SOB missing
c.cantanheide@xxxxxxxxx Jonathan.Cameron@xxxxxxxxxx
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
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.
thanks,
greg k-h
