Another comment below, I'd rather you respin them, with a version
number on them so I know which ones to pick up, really this is my 3rd
try at merging these and I keep finding sillyness.

>> index 07711b0..3cfa160 100644
> --- a/include/drm/drm_mode.h
> +++ b/include/drm/drm_mode.h
> @@ -27,6 +27,8 @@
> ?#ifndef _DRM_MODE_H
> ?#define _DRM_MODE_H
>
> +#include <linux/videodev2.h>

You are essentially changing the drm abi to require videodev2.h here,
these files are reused in userspace, I really don't like this, the
commit message makes no mention of this either
> +
> ?#define DRM_DISPLAY_INFO_LEN ? 32
> ?#define DRM_CONNECTOR_NAME_LEN 32
> ?#define DRM_DISPLAY_MODE_LEN ? 32
> @@ -136,7 +138,6 @@ struct drm_mode_set_plane {
> ?};
>
> ?struct drm_mode_get_plane {
> - ? ? ? __u64 format_type_ptr;
> ? ? ? ?__u32 plane_id;
>
> ? ? ? ?__u32 crtc_id;
> @@ -146,6 +147,7 @@ struct drm_mode_get_plane {
> ? ? ? ?__u32 gamma_size;
>
> ? ? ? ?__u32 count_format_types;
> + ? ? ? __u64 format_type_ptr;
> ?};

And you changed ABI here from your first patch? why isn't this in the
first patch?

try again? (with versioned patches).

Dave.

Reply via email to