linux-next: manual merge of the drm tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/i915/i915_pmu.h

between commit:

  4c83f0a788cc ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")

from Linus' tree and commit:

  109ec558370f ("drm/i915/pmu: Only enumerate available counters in sysfs")

from the drm 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 drivers/gpu/drm/i915/i915_pmu.h
index bb62df15afa4,5a2e013a56bb..000000000000
--- a/drivers/gpu/drm/i915/i915_pmu.h
+++ b/drivers/gpu/drm/i915/i915_pmu.h
@@@ -96,10 -94,14 +96,18 @@@ struct i915_pmu 
  	 * struct intel_engine_cs.
  	 */
  	struct i915_pmu_sample sample[__I915_NUM_PMU_SAMPLERS];
 +	/**
 +	 * @suspended_jiffies_last: Cached suspend time from PM core.
 +	 */
 +	unsigned long suspended_jiffies_last;
+ 	/**
+ 	 * @i915_attr: Memory block holding device attributes.
+ 	 */
+ 	void *i915_attr;
+ 	/**
+ 	 * @pmu_attr: Memory block holding device attributes.
+ 	 */
+ 	void *pmu_attr;
  };
  
  #ifdef CONFIG_PERF_EVENTS

Attachment: pgpMQE4K6Piuw.pgp
Description: OpenPGP digital signature