[linux-yocto] [PATCH 0/1] Fix i915 merge

[Bruce Ashfield]

On 2016-08-22 2:20 PM, Sullivan, California L wrote:
> Hmm, the patches apply directly just fine. Preempt-rt has a few specific
> changes, but tiny has a zero diff for i915. I'm not sure why the default
> merge strategy isn't working.
>
> In any case, using 'git merge strategy=resolve' seems to work, we get
> the expected diff, and preempt-rt compiles again. Tiny compiles with the

I can do that, but would have preferred a fixed up pull request, since
-Xours always works as well, but isn't necessarily the right thing.

I'll take care of the update, and if it is still broken, feel free to
fire off more patches.

> old kernel tools. Tiny appears to not like the new kernel tools, as
> do_kernel_metadata fails until I revert back to old tools even with old
> SRCREVs, but I'll leave that for another time.

I just built tiny for qemux86 with no issues:

NOTE: Executing SetScene Tasks 
 
 

NOTE: Executing RunQueue Tasks 
 
 

WARNING: linux-yocto-tiny-4.4.18+gitAUTOINC+6a12efcabe_0a0c93f29c-r0 
do_kernel_configcheck: [kernel config]: specified values did not make it 
into the kernel's final configuration: 

 
 
 

---------- CONFIG_TINY_RCU ----------------- 
 
 

Config: CONFIG_TINY_RCU 
 
 

From: 
/home/bruce/poky/build/tmp/work-shared/qemux86/kernel-source/.kernel-meta/configs/standard/tiny/ktypes/tiny/tiny.cfg 
 

Requested value:  CONFIG_TINY_RCU=y 
 
 

Actual value: 
 
 

 
 
 

Config 'TINY_RCU' has the following conditionals: 
 
 

   !PREEMPT && !SMP (value: "n") 
 
 

Dependency values are: 
 
 

   PREEMPT [y] y [y] SMP [y] 
 
 

 
 
 

---------- CONFIG_BASE_SMALL ----------------- 
 
 

Config: CONFIG_BASE_SMALL 
 
 

From: 
/home/bruce/poky/build/tmp/work-shared/qemux86/kernel-source/.kernel-meta/configs/standard/tiny/ktypes/tiny/tiny.cfg 
 

Requested value:  CONFIG_BASE_SMALL=1 
 
 

Actual value:     CONFIG_BASE_SMALL=0 
 
 

 
 
 

Config 'BASE_SMALL' has the following conditionals: 
 
 

   BASE_FULL (value: "y") 
 
 

!BASE_FULL (value: "n") 
 
 

Dependency values are: 
 
 

   1 [1] 0 [0] BASE_FULL [y] 
 
 

 
 
 

 
 
 

NOTE: Tasks Summary: Attempted 453 tasks of which 387 didn't need to be 
rerun and all succeeded. 
 

 
 
 

Summary: There were 5 WARNING messages shown. 
 


Bruce

>
> ---
> Cal
>
> On 08/19/2016 09:24 PM, Bruce Ashfield wrote:
>> On 2016-08-19 11:35 PM, California Sullivan wrote:
>>> Eric, Bruce, please make sure my strategy with this fix is sane before
>>> merging.
>> Looks sane to me, if it gets things building .. that's good enough
>> for now. We can always apply more patches.
>>
>>> If it is, please apply it to standard/intel/base and merge into all the
>>> other intel branches.
>> I put this onto standard/intel/base and merged it into
>> standard/intel/bxt-rebase.
>>
>> But I'm getting drm conflicts when I merged standard/intel/base into
>> standard/preempt-rt/intel/base and standard/tiny/intel/base. So we need
>> to look at those branches and identify what is missing (since I already
>> have the same 4.4.18 and drm content merged to it already).
>>
>> Bruce
>>
>>> Thanks,
>>> Cal Sullivan
>>>
>>> California Sullivan (1):
>>>   drm/i915: Fix i915 merge with v4.4.16
>>>
>>>  drivers/gpu/drm/i915/i915_reg.h               |  2 ++
>>>  drivers/gpu/drm/i915/intel_dp.c               | 11 +++++------
>>>  drivers/gpu/drm/i915/intel_dp_link_training.c | 26 ++------------------------
>>>  drivers/gpu/drm/i915/intel_drv.h              |  2 --
>>>  4 files changed, 9 insertions(+), 32 deletions(-)
>>>
>>
>