From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA733C4360F for ; Tue, 2 Apr 2019 09:57:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D73F20857 for ; Tue, 2 Apr 2019 09:57:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728739AbfDBJ5d (ORCPT ); Tue, 2 Apr 2019 05:57:33 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:50510 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726157AbfDBJ5c (ORCPT ); Tue, 2 Apr 2019 05:57:32 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [10.3.19.213]) by Forcepoint Email with ESMTP id 3FEEC7D6B1CAF19C9B14; Tue, 2 Apr 2019 17:57:31 +0800 (CST) Received: from localhost (10.202.226.61) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.408.0; Tue, 2 Apr 2019 17:57:28 +0800 Date: Tue, 2 Apr 2019 10:57:21 +0100 From: Jonathan Cameron To: Greg KH CC: Jonathan Cameron , Subject: Re: [PULL] First round of new device support, cleanups and fixes for IIO in the 5.2 cycle. Message-ID: <20190402105721.000020bb@huawei.com> In-Reply-To: <20190402071452.GA22035@kroah.com> References: <20190401215936.3d6a460d@archlinux> <20190401220407.78d9b19c@archlinux> <20190402071452.GA22035@kroah.com> Organization: Huawei X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.202.226.61] Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Tue, 2 Apr 2019 09:14:52 +0200 Greg KH 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 > Signed-off-by: Max Krummenacher > Signed-off-by: Philippe Schenker > Signed-off-by: Lee Jones > Commit e909fb9e1beec6968ad7dda3081556526a641ea3 > committer SOB missing > stefan@agner.ch Jonathan.Cameron@huawei.com > Signed-off-by: Stefan Agner > Signed-off-by: Max Krummenacher > Signed-off-by: Philippe Schenker > Signed-off-by: Lee Jones > Commit 8af18b62c593560c7ce360244fb47be27bb50a32 > committer SOB missing > philippe.schenker@toradex.com Jonathan.Cameron@huawei.com > Signed-off-by: Philippe Schenker > Signed-off-by: Lee Jones > Commit d848b89bae04ade886320367f510d9f64c3a6e20 > committer SOB missing > stefan@agner.ch Jonathan.Cameron@huawei.com > Signed-off-by: Stefan Agner > Signed-off-by: Max Krummenacher > Signed-off-by: Philippe Schenker > Signed-off-by: Lee Jones > Commit ac7358ded6a5f1b6bf29031301bb9f774bf05372 > committer SOB missing > philippe.schenker@toradex.com Jonathan.Cameron@huawei.com > Signed-off-by: Philippe Schenker > Signed-off-by: Lee Jones > Commit 0af69b0a78eac5a7041674be1736929a91758256 > committer SOB missing > philippe.schenker@toradex.com Jonathan.Cameron@huawei.com > Signed-off-by: Philippe Schenker > Signed-off-by: Lee Jones > Commit 6c038d0bded5da24f13c509de7f47aba58a3bfc1 > author SOB missing > c.cantanheide@gmail.com Jonathan.Cameron@huawei.com > Signed-off-by: Jonathan Cameron > 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