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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0AF64C433F5 for ; Thu, 23 Dec 2021 09:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ig2T12Os7nYY5I24uz+5XPIMWtpC0HSaiVv8TKu8F0I=; b=xtFGIkYaIDAr5p ErhBJNgrQWOx3Rep/8OXhqFP3a3H2r4bW43bU3vq5YPOFg139bpQePobhwoWGTmO/+yq7MVat5jfd 1qLpAIvu+101mZmzu8SeiJ7Irl5gKjr6rdQPkqncKUcOgXSFWTFuvt97dNwtUq4qvdJM9CRAC0YHS 31bmpTTCFY0e0HVV558XJqZgPlivYP5OdZE0jSL8qBSrsjNQK17ZZxVZztTk0b/Niawq7VQS45uCB hNBNe2tzC108kveGv80JsfkWTxftWp/yCqYrPSy7N5XDuyJOT+BZnUhJ5NNZmSvzb8zXyGfOgdE1+ hjVssWS8gqvhqZTcbYXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0K1v-00CMtH-5n; Thu, 23 Dec 2021 09:04:55 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n0K1r-00CMsf-Hk for linux-arm-kernel@lists.infradead.org; Thu, 23 Dec 2021 09:04:53 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6D7B0B81F8F; Thu, 23 Dec 2021 09:04:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54F06C36AE9; Thu, 23 Dec 2021 09:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1640250288; bh=GLtZZPLmwbU+EfifaiOw0EMJpcnVumWosfcpIfQSxmc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FVf5U7fxSnn2gRKpJIxZxZ/1Q7MfiRk2/Qoh8zjQssn1Ps6pi0ynw/W2m8HqbZjw5 Sw5NM+EmlbUaiytVsKEw4JQEwfL5Db8LqQrm6dOZawUldJ9GjEjUdi+2DBuqsSwm/k L00mbrYTwkuWxYyLyK7SdfT4Ds4346xyCoGeVhB0= Date: Thu, 23 Dec 2021 10:04:43 +0100 From: Greg KH To: Ronak Jain Cc: Michal Simek , "linux-kernel@vger.kernel.org" , Rajan Vaja , "corbet@lwn.net" , "linux-arm-kernel@lists.infradead.org" , "arnd@arndb.de" , Sai Krishna Potthuri Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features Message-ID: References: <20211206112101.24955-1-ronak.jain@xilinx.com> <20211206112101.24955-2-ronak.jain@xilinx.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211223_010451_778983_5BAB4C17 X-CRM114-Status: GOOD ( 22.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Dec 23, 2021 at 08:55:09AM +0000, Ronak Jain wrote: > Hi Greg, > > > -----Original Message----- > > From: Greg KH > > Sent: Tuesday, December 21, 2021 2:48 PM > > To: Ronak Jain > > Cc: Michal Simek ; linux-kernel@vger.kernel.org; Rajan > > Vaja ; corbet@lwn.net; linux-arm- > > kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri > > > > Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features > > > > On Mon, Dec 06, 2021 at 03:20:59AM -0800, Ronak Jain wrote: > > > Add support for runtime features by using an IOCTL call. The features > > > can be enabled or disabled from the firmware as well as the features > > > can be configured at runtime by querying IOCTL_SET_FEATURE_CONFIG id. > > > Similarly, the user can get the configured values of features by > > > querying IOCTL_GET_FEATURE_CONFIG id. > > > > > > Signed-off-by: Ronak Jain > > > --- > > > Changes in v4: > > > - Update commit message > > > > > > Changes in v3: > > > - Resolved merged conflict > > > > > > Changes in v2: > > > - Resolved merged conflict > > > - Update commit message > > > --- > > > drivers/firmware/xilinx/zynqmp.c | 27 +++++++++++++++++++++++++++ > > > include/linux/firmware/xlnx-zynqmp.h | 25 +++++++++++++++++++++++++ > > > 2 files changed, 52 insertions(+) > > > > I still get merge conflicts with this change: > > > > checking file drivers/firmware/xilinx/zynqmp.c Hunk #1 succeeded at 1156 > > (offset 27 lines). > > checking file include/linux/firmware/xlnx-zynqmp.h > > Hunk #1 FAILED at 126. > > Hunk #2 succeeded at 376 (offset 17 lines). > > Hunk #3 FAILED at 435. > > Hunk #4 succeeded at 697 (offset 31 lines). > > 2 out of 4 hunks FAILED > > > > > > What branch/tree are you making it against? > > > I have created patches on the master branch of https://github.com/torvalds/linux. Please work against linux-next, it has the combined work of everyone else as well. thanks, greg k-h _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F04EC433EF for ; Thu, 23 Dec 2021 09:04:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347360AbhLWJEw (ORCPT ); Thu, 23 Dec 2021 04:04:52 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:39866 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347339AbhLWJEu (ORCPT ); Thu, 23 Dec 2021 04:04:50 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7594FB81F9F for ; Thu, 23 Dec 2021 09:04:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54F06C36AE9; Thu, 23 Dec 2021 09:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1640250288; bh=GLtZZPLmwbU+EfifaiOw0EMJpcnVumWosfcpIfQSxmc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FVf5U7fxSnn2gRKpJIxZxZ/1Q7MfiRk2/Qoh8zjQssn1Ps6pi0ynw/W2m8HqbZjw5 Sw5NM+EmlbUaiytVsKEw4JQEwfL5Db8LqQrm6dOZawUldJ9GjEjUdi+2DBuqsSwm/k L00mbrYTwkuWxYyLyK7SdfT4Ds4346xyCoGeVhB0= Date: Thu, 23 Dec 2021 10:04:43 +0100 From: Greg KH To: Ronak Jain Cc: Michal Simek , "linux-kernel@vger.kernel.org" , Rajan Vaja , "corbet@lwn.net" , "linux-arm-kernel@lists.infradead.org" , "arnd@arndb.de" , Sai Krishna Potthuri Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features Message-ID: References: <20211206112101.24955-1-ronak.jain@xilinx.com> <20211206112101.24955-2-ronak.jain@xilinx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 23, 2021 at 08:55:09AM +0000, Ronak Jain wrote: > Hi Greg, > > > -----Original Message----- > > From: Greg KH > > Sent: Tuesday, December 21, 2021 2:48 PM > > To: Ronak Jain > > Cc: Michal Simek ; linux-kernel@vger.kernel.org; Rajan > > Vaja ; corbet@lwn.net; linux-arm- > > kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri > > > > Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features > > > > On Mon, Dec 06, 2021 at 03:20:59AM -0800, Ronak Jain wrote: > > > Add support for runtime features by using an IOCTL call. The features > > > can be enabled or disabled from the firmware as well as the features > > > can be configured at runtime by querying IOCTL_SET_FEATURE_CONFIG id. > > > Similarly, the user can get the configured values of features by > > > querying IOCTL_GET_FEATURE_CONFIG id. > > > > > > Signed-off-by: Ronak Jain > > > --- > > > Changes in v4: > > > - Update commit message > > > > > > Changes in v3: > > > - Resolved merged conflict > > > > > > Changes in v2: > > > - Resolved merged conflict > > > - Update commit message > > > --- > > > drivers/firmware/xilinx/zynqmp.c | 27 +++++++++++++++++++++++++++ > > > include/linux/firmware/xlnx-zynqmp.h | 25 +++++++++++++++++++++++++ > > > 2 files changed, 52 insertions(+) > > > > I still get merge conflicts with this change: > > > > checking file drivers/firmware/xilinx/zynqmp.c Hunk #1 succeeded at 1156 > > (offset 27 lines). > > checking file include/linux/firmware/xlnx-zynqmp.h > > Hunk #1 FAILED at 126. > > Hunk #2 succeeded at 376 (offset 17 lines). > > Hunk #3 FAILED at 435. > > Hunk #4 succeeded at 697 (offset 31 lines). > > 2 out of 4 hunks FAILED > > > > > > What branch/tree are you making it against? > > > I have created patches on the master branch of https://github.com/torvalds/linux. Please work against linux-next, it has the combined work of everyone else as well. thanks, greg k-h