linux-next: manual merge of the kspp tree with the drm-misc tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi Kees,

Today's linux-next merge of the kspp tree got a conflict in:

  include/drm/drm_drv.h

between commit:

  91faa0478b59 ("drm: drop extern from function decls")

from the drm-misc tree and commit:

  6bbaac116552 ("initify: Mark functions with the __nocapture attribute")

from the kspp tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/drm/drm_drv.h
index 53b98321df9b,ade960c65929..000000000000
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@@ -510,19 -403,11 +510,19 @@@ struct drm_driver 
  	int num_ioctls;
  	const struct file_operations *fops;
  
 +	/* Everything below here is for legacy driver, never use! */
 +	/* private: */
 +
  	/* List of devices hanging off this driver with stealth attach. */
  	struct list_head legacy_dev_list;
 +	int (*firstopen) (struct drm_device *);
 +	int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
 +	int (*dma_quiescent) (struct drm_device *);
 +	int (*context_dtor) (struct drm_device *dev, int context);
 +	int dev_priv_size;
  };
  
- __printf(6, 7)
 -extern __printf(6, 7) __nocapture(4)
++__printf(6, 7) __nocapture(4)
  void drm_dev_printk(const struct device *dev, const char *level,
  		    unsigned int category, const char *function_name,
  		    const char *prefix, const char *format, ...);