linux-next: manual merge of the bkl-llseek tree with the drm tree

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the bkl-llseek tree got a conflict in
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c between commit
7fbd721ad35f8ffec8d9a82e0e4b390cb6c9f4f7 ("drm/vmwgfx: Add new-style PM
hooks to improve hibernation behavior") from the drm tree and commit
dc880abef75e7c62c9048171f5112500f36a9244 ("drm: use noop_llseek") from
the bkl-llseek tree.

Just a trivial whitepsace change.  I fixed it up (see below) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index f2942b3,d237190..0000000
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@@ -899,16 -745,16 +899,17 @@@ static struct drm_driver driver = 
  #if defined(CONFIG_COMPAT)
  		 .compat_ioctl = drm_compat_ioctl,
  #endif
+ 		 .llseek = noop_llseek,
 -		 },
 +	},
  	.pci_driver = {
 -		       .name = VMWGFX_DRIVER_NAME,
 -		       .id_table = vmw_pci_id_list,
 -		       .probe = vmw_probe,
 -		       .remove = vmw_remove,
 -		       .suspend = vmw_pci_suspend,
 -		       .resume = vmw_pci_resume
 -		       },
 +		 .name = VMWGFX_DRIVER_NAME,
 +		 .id_table = vmw_pci_id_list,
 +		 .probe = vmw_probe,
 +		 .remove = vmw_remove,
 +		 .driver = {
 +			 .pm = &vmw_pm_ops
 +		 }
 +	 },
  	.name = VMWGFX_DRIVER_NAME,
  	.desc = VMWGFX_DRIVER_DESC,
  	.date = VMWGFX_DRIVER_DATE,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/