All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Ronak Jain <ronakj@xilinx.com>
Cc: Michal Simek <michals@xilinx.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Rajan Vaja <RAJANV@xilinx.com>, "corbet@lwn.net" <corbet@lwn.net>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	 "arnd@arndb.de" <arnd@arndb.de>,
	Sai Krishna Potthuri <lakshmis@xilinx.com>
Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
Date: Thu, 23 Dec 2021 10:04:43 +0100	[thread overview]
Message-ID: <YcQ7qynk9vk336b+@kroah.com> (raw)
In-Reply-To: <BYAPR02MB448806DCF28EA41AFE4B3D0EA47E9@BYAPR02MB4488.namprd02.prod.outlook.com>

On Thu, Dec 23, 2021 at 08:55:09AM +0000, Ronak Jain wrote:
> Hi Greg,
> 
> > -----Original Message-----
> > From: Greg KH <gregkh@linuxfoundation.org>
> > Sent: Tuesday, December 21, 2021 2:48 PM
> > To: Ronak Jain <ronakj@xilinx.com>
> > Cc: Michal Simek <michals@xilinx.com>; linux-kernel@vger.kernel.org; Rajan
> > Vaja <RAJANV@xilinx.com>; corbet@lwn.net; linux-arm-
> > kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri
> > <lakshmis@xilinx.com>
> > 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?
> > 
> 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

WARNING: multiple messages have this Message-ID (diff)
From: Greg KH <gregkh@linuxfoundation.org>
To: Ronak Jain <ronakj@xilinx.com>
Cc: Michal Simek <michals@xilinx.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Rajan Vaja <RAJANV@xilinx.com>, "corbet@lwn.net" <corbet@lwn.net>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	"arnd@arndb.de" <arnd@arndb.de>,
	Sai Krishna Potthuri <lakshmis@xilinx.com>
Subject: Re: [PATCH v4 1/3] firmware: xilinx: Add support for runtime features
Date: Thu, 23 Dec 2021 10:04:43 +0100	[thread overview]
Message-ID: <YcQ7qynk9vk336b+@kroah.com> (raw)
In-Reply-To: <BYAPR02MB448806DCF28EA41AFE4B3D0EA47E9@BYAPR02MB4488.namprd02.prod.outlook.com>

On Thu, Dec 23, 2021 at 08:55:09AM +0000, Ronak Jain wrote:
> Hi Greg,
> 
> > -----Original Message-----
> > From: Greg KH <gregkh@linuxfoundation.org>
> > Sent: Tuesday, December 21, 2021 2:48 PM
> > To: Ronak Jain <ronakj@xilinx.com>
> > Cc: Michal Simek <michals@xilinx.com>; linux-kernel@vger.kernel.org; Rajan
> > Vaja <RAJANV@xilinx.com>; corbet@lwn.net; linux-arm-
> > kernel@lists.infradead.org; arnd@arndb.de; Sai Krishna Potthuri
> > <lakshmis@xilinx.com>
> > 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?
> > 
> 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

  reply	other threads:[~2021-12-23  9:06 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-06 11:20 [PATCH v4 0/3] Add support for runtime features Ronak Jain
2021-12-06 11:20 ` Ronak Jain
2021-12-06 11:20 ` [PATCH v4 1/3] firmware: xilinx: " Ronak Jain
2021-12-06 11:20   ` Ronak Jain
2021-12-21  9:17   ` Greg KH
2021-12-21  9:17     ` Greg KH
2021-12-23  8:55     ` Ronak Jain
2021-12-23  8:55       ` Ronak Jain
2021-12-23  9:04       ` Greg KH [this message]
2021-12-23  9:04         ` Greg KH
2021-12-23  9:06         ` Ronak Jain
2021-12-23  9:06           ` Ronak Jain
2021-12-06 11:21 ` [PATCH v4 2/3] firmware: zynqmp: Add documentation for runtime feature config Ronak Jain
2021-12-06 11:21   ` Ronak Jain
2021-12-21  9:18   ` Greg KH
2021-12-21  9:18     ` Greg KH
2021-12-06 11:21 ` [PATCH v4 3/3] firmware: xilinx: Add sysfs support for " Ronak Jain
2021-12-06 11:21   ` Ronak Jain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YcQ7qynk9vk336b+@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=RAJANV@xilinx.com \
    --cc=arnd@arndb.de \
    --cc=corbet@lwn.net \
    --cc=lakshmis@xilinx.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michals@xilinx.com \
    --cc=ronakj@xilinx.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.