Messages in this thread | | | Date | Tue, 21 Dec 2021 10:17:49 +0100 | From | Greg KH <> | 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 <ronak.jain@xilinx.com> > --- > 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?
thanks,
greg k-h
| |