Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2021-12-23 09:04:53
Also in:
lkml
On Thu, Dec 23, 2021 at 08:55:09AM +0000, Ronak Jain wrote:
Hi Greg,quoted
-----Original Message----- From: Greg KH <gregkh@linuxfoundation.org> Sent: Tuesday, December 21, 2021 2:48 PM To: Ronak Jain <redacted> Cc: Michal Simek <redacted>; linux-kernel@vger.kernel.org; Rajan Vaja [off-list ref]; corbet@lwn.net; linux-arm- kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri [off-list ref] 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:quoted
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 <redacted> --- 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