Re: [PATCH] staging: sm750fb: avoid conflicting vesafb

[Greg Kroah-Hartman]

On Sat, Jul 29, 2017 at 10:17:43PM +0100, Sudip Mukherjee wrote:
> From: Teddy Wang <teddy.wang@xxxxxxxxxxxxxxxxx>
> 
> commit 740c433ec35187b45abe08bb6c45a321a791be8e upstream
> 
> If vesafb is enabled in the config then /dev/fb0 is created by vesa
> and this sm750 driver gets fb1, fb2. But we need to be fb0 and fb1 to
> effectively work with xorg.
> So if it has been alloted fb1, then try to remove the other fb0.
> 
> In the previous send, why #ifdef is used was asked.
> https://lkml.org/lkml/2017/6/25/57
> 
> Answered at: https://lkml.org/lkml/2017/6/25/69
> Also pasting here for reference.
> 
> 'Did a quick research into "why".
> The patch d8801e4df91e ("x86/PCI: Set IORESOURCE_ROM_SHADOW only for the
> default VGA device") has started setting IORESOURCE_ROM_SHADOW in flags
> for a default VGA device and that is being done only for x86.
> And so, we will need that #ifdef to check IORESOURCE_ROM_SHADOW as that
> needs to be checked only for a x86 and not for other arch.'
> 
> Cc: <stable@xxxxxxxxxxxxxxx> # v4.4
> Signed-off-by: Teddy Wang <teddy.wang@xxxxxxxxxxxxxxxxx>
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
>  drivers/staging/sm750fb/sm750.c | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 

Still does not apply to my staging-linus branch without manual fixups.
What is going on here?  Please fix up and resend properly...

thanks,

greg k-h