Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API

[Greg Kroah-Hartman]

On Wed, Aug 30, 2017 at 02:38:45PM +0200, Christoph Hellwig wrote:
> On Mon, Jul 31, 2017 at 08:20:25PM +0300, Andy Shevchenko wrote:
> > Yep! There are so many conflicts that would be better just to push
> > through your tree.
> > 
> > I have just sent a v2 of this patch separately.
> 
> Greg, did you pick that patch up?

Yes, it's already in my tree and in linux-next.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API

[Andy Shevchenko]

On Wed, 2017-08-30 at 14:38 +0200, Christoph Hellwig wrote:
> On Mon, Jul 31, 2017 at 08:20:25PM +0300, Andy Shevchenko wrote:
> > Yep! There are so many conflicts that would be better just to push
> > through your tree.
> > 
> > I have just sent a v2 of this patch separately.
> 
> Greg, did you pick that patch up?

That patch in his tree.

-- 
Andy Shevchenko 
Intel Finland Oy
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API

[Christoph Hellwig]

On Mon, Jul 31, 2017 at 08:20:25PM +0300, Andy Shevchenko wrote:
> Yep! There are so many conflicts that would be better just to push
> through your tree.
> 
> I have just sent a v2 of this patch separately.

Greg, did you pick that patch up?
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API

[Andy Shevchenko]

On Sun, 2017-07-30 at 10:37 -0700, Greg Kroah-Hartman wrote:
> On Sun, Jul 30, 2017 at 08:26:48PM +0300, Andy Shevchenko wrote:
> > On Sun, Jul 30, 2017 at 6:32 PM, Greg Kroah-Hartman
> >  wrote:

> > > Doesn't apply to the staging tree at all :(
> > 
> > No surprises, it was cooked against uuid tree in the first place.
> > If you agree to take it through staging tree I will prepare a
> > rebased version.
> > Does it sound good?
> 
> You can take it through the uuid tree if it's easier for you, but then
> someone will have to deal with the merge issues...
> 
> If it's easier, I can take it to prevent the merge problems.

Yep! There are so many conflicts that would be better just to push
through your tree.

I have just sent a v2 of this patch separately.

-- 
Andy Shevchenko 
Intel Finland Oy
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API

[Greg Kroah-Hartman]

On Sun, Jul 30, 2017 at 08:26:48PM +0300, Andy Shevchenko wrote:
> On Sun, Jul 30, 2017 at 6:32 PM, Greg Kroah-Hartman
>  wrote:
> > On Wed, Jul 26, 2017 at 01:01:41PM +0300, Andy Shevchenko wrote:
> >> On Wed, 2017-07-19 at 21:28 +0300, Andy Shevchenko wrote:
> >> > There are new types and helpers that are supposed to be used in new
> >> > code.
> >> >
> >> > As a preparation to get rid of legacy types and API functions do
> >> > the conversion here.
> >> >
> >> > While here, re-indent couple of lines to increase readability.
> >>
> >> This looks like no user space UUID API is involved, can be routed via
> >> either tree (uuid or staging).
> >>
> >> Anyone to comment?
> >
> > Doesn't apply to the staging tree at all :(
> 
> No surprises, it was cooked against uuid tree in the first place.
> If you agree to take it through staging tree I will prepare a rebased version.
> Does it sound good?

You can take it through the uuid tree if it's easier for you, but then
someone will have to deal with the merge issues...

If it's easier, I can take it to prevent the merge problems.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API

[Andy Shevchenko]

On Sun, Jul 30, 2017 at 6:32 PM, Greg Kroah-Hartman
 wrote:
> On Wed, Jul 26, 2017 at 01:01:41PM +0300, Andy Shevchenko wrote:
>> On Wed, 2017-07-19 at 21:28 +0300, Andy Shevchenko wrote:
>> > There are new types and helpers that are supposed to be used in new
>> > code.
>> >
>> > As a preparation to get rid of legacy types and API functions do
>> > the conversion here.
>> >
>> > While here, re-indent couple of lines to increase readability.
>>
>> This looks like no user space UUID API is involved, can be routed via
>> either tree (uuid or staging).
>>
>> Anyone to comment?
>
> Doesn't apply to the staging tree at all :(

No surprises, it was cooked against uuid tree in the first place.
If you agree to take it through staging tree I will prepare a rebased version.
Does it sound good?


-- 
With Best Regards,
Andy Shevchenko
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API

[Greg Kroah-Hartman]

On Wed, Jul 26, 2017 at 01:01:41PM +0300, Andy Shevchenko wrote:
> On Wed, 2017-07-19 at 21:28 +0300, Andy Shevchenko wrote:
> > There are new types and helpers that are supposed to be used in new
> > code.
> > 
> > As a preparation to get rid of legacy types and API functions do
> > the conversion here.
> > 
> > While here, re-indent couple of lines to increase readability.
> 
> This looks like no user space UUID API is involved, can be routed via
> either tree (uuid or staging).
> 
> Anyone to comment?

Doesn't apply to the staging tree at all :(
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API

[Andy Shevchenko]

On Wed, 2017-07-19 at 21:28 +0300, Andy Shevchenko wrote:
> There are new types and helpers that are supposed to be used in new
> code.
> 
> As a preparation to get rid of legacy types and API functions do
> the conversion here.
> 
> While here, re-indent couple of lines to increase readability.

This looks like no user space UUID API is involved, can be routed via
either tree (uuid or staging).

Anyone to comment?

> 
> Cc: David Kershner 
> Cc: Greg Kroah-Hartman 
> Cc: sparmaintai...@unisys.com
> Cc: de...@driverdev.osuosl.org
> Signed-off-by: Andy Shevchenko 
> ---
>  drivers/staging/unisys/Documentation/overview.txt  | 14 +++
>  drivers/staging/unisys/include/channel.h   | 45 ++---
> ---
>  drivers/staging/unisys/include/iochannel.h | 14 +--
>  drivers/staging/unisys/include/visorbus.h  | 12 +++---
>  drivers/staging/unisys/visorbus/controlvmchannel.h | 24 ---
>  drivers/staging/unisys/visorbus/vbuschannel.h  |  7 ++--
>  drivers/staging/unisys/visorbus/visorbus_main.c| 28 ++---
>  drivers/staging/unisys/visorbus/visorbus_private.h |  6 +--
>  drivers/staging/unisys/visorbus/visorchannel.c | 48 +++
> ---
>  drivers/staging/unisys/visorbus/visorchipset.c | 39 ++---
> -
>  drivers/staging/unisys/visorhba/visorhba_main.c|  6 +--
>  drivers/staging/unisys/visorinput/visorinput.c | 38 -
> 
>  drivers/staging/unisys/visornic/visornic_main.c|  6 +--
>  13 files changed, 135 insertions(+), 152 deletions(-)
> 
> diff --git a/drivers/staging/unisys/Documentation/overview.txt
> b/drivers/staging/unisys/Documentation/overview.txt
> index e0466bfada2f..9ab30af265a5 100644
> --- a/drivers/staging/unisys/Documentation/overview.txt
> +++ b/drivers/staging/unisys/Documentation/overview.txt
> @@ -221,7 +221,7 @@ The following files exist under
> /sys/devices/visorbus/vbus:dev:
>  
>  The visorhba driver registers with visorbus as the function driver to
>  handle virtual scsi disk devices, specified using the
> -VISOR_VHBA_CHANNEL_UUID type in the visorbus_register_visor_driver()
> +VISOR_VHBA_CHANNEL_GUID type in the visorbus_register_visor_driver()
>  call. visorhba uses scsi_add_host() to expose a Linux block device
>  (e.g., /sys/block/) in the guest environment for each s-Par virtual
> device.
>  
> @@ -240,7 +240,7 @@ When compiled as a module, visorhba can be
> autoloaded by visorbus in
>  standard udev/systemd environments, as it includes the modules.alias
>  definition:
>  
> -"visorbus:"+VISOR_VHBA_CHANNEL_UUID_STR
> +"visorbus:"+VISOR_VHBA_CHANNEL_GUID_STR
>  
>  i.e.:
>  
> @@ -252,7 +252,7 @@ i.e.:
>  
>  The visornic driver registers with visorbus as the function driver to
>  handle virtual network devices, specified using the
> -VISOR_VNIC_CHANNEL_UUID type in the visorbus_register_visor_driver()
> +VISOR_VNIC_CHANNEL_GUID type in the visorbus_register_visor_driver()
>  call. visornic uses register_netdev() to expose a Linux device of
> class net
>  (e.g., /sys/class/net/) in the guest environment for each s-Par
> virtual
>  device.
> @@ -270,7 +270,7 @@ When compiled as a module, visornic can be
> autoloaded by visorbus in
>  standard udev/systemd environments, as it includes the modules.alias
>  definition:
>  
> -"visorbus:"+VISOR_VNIC_CHANNEL_UUID_STR
> +"visorbus:"+VISOR_VNIC_CHANNEL_GUID_STR
>  
>  i.e.:
>  
> @@ -282,7 +282,7 @@ i.e.:
>  
>  The visorinput driver registers with visorbus as the function driver
> to
>  handle human input devices, specified using the
> -VISOR_KEYBOARD_CHANNEL_UUID and VISOR_MOUSE_CHANNEL_UUID
> +VISOR_KEYBOARD_CHANNEL_GUID and VISOR_MOUSE_CHANNEL_GUID
>  types in the visorbus_register_visor_driver() call. visorinput uses
>  input_register_device() to expose devices of class input
>  (e.g., /sys/class/input/) for virtual keyboard and virtual mouse
> devices.
> @@ -307,8 +307,8 @@ When compiled as a module, visorinput can be
> autoloaded by visorbus in
>  standard udev/systemd environments, as it includes the modules.alias
>  definition:
>  
> -"visorbus:"+VISOR_MOUSE_CHANNEL_UUID_STR
> -"visorbus:"+VISOR_KEYBOARD_CHANNEL_UUID_STR
> +"visorbus:"+VISOR_MOUSE_CHANNEL_GUID_STR
> +"visorbus:"+VISOR_KEYBOARD_CHANNEL_GUID_STR
>  
>  i.e.:
>  
> diff --git a/drivers/staging/unisys/include/channel.h
> b/drivers/staging/unisys/include/channel.h
> index 692efcb38245..b09b1f55a6f1 100644
> --- a/drivers/staging/unisys/include/channel.h
> +++ b/drivers/staging/unisys/include/channel.h
> @@ -116,13 +116,13 @@ struct channel_header {
>   u32 header_size;/* sizeof(struct channel_header) */
>   u64 size;   /* Total size of this channel in
> bytes */
>   u64 features;   /* Flags to modify behavior */
> - uuid_le chtype; /* Channel type: data, bus,
> control, etc. */
> + guid_t