Re: [PATCH] platform/x86: convert to DEFINE_SHOW_ATTRIBUTE

[Andy Shevchenko]

On Tue, Dec 4, 2018 at 5:30 PM Frank Lee <tiny.windzz@xxxxxxxxx> wrote:
> On Tue, Dec 4, 2018 at 8:40 PM Andy Shevchenko
> <andy.shevchenko@xxxxxxxxx> wrote:
> > On Tue, Dec 4, 2018 at 5:59 AM Frank Lee <tiny.windzz@xxxxxxxxx> wrote:
> > > On Tue, Dec 4, 2018 at 3:09 AM Andy Shevchenko
> > > <andy.shevchenko@xxxxxxxxx> wrote:
> > > > On Sat, Dec 1, 2018 at 5:52 PM Yangtao Li <tiny.windzz@xxxxxxxxx> wrote:
> > > > > Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.

> > I like your patch, but...
> >
> > > > By some reason it's not applicable.
> > > > Please, rebase on top of our for-next branch, thanks!
> >
> > > For what reason?
> >
> > ...because I can't apply it, it fails with conflicts.
> >
> > >  I thought that for-next branch has not changed much.
> >
> > That's correct, it's updated only by approved patch series which is
> > not many _this_ cycle.
> I am confused about what you said.
> Because I pulled your .git down, there is no conflicts when apply it.......

linux(for-next)
$ git pw patch apply 10707735 -s
error: patch failed: drivers/platform/x86/intel_pmc_core.c:602
error: drivers/platform/x86/intel_pmc_core.c: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: platform/x86: convert to DEFINE_SHOW_ATTRIBUTE
Patch failed at 0001 platform/x86: convert to DEFINE_SHOW_ATTRIBUTE
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

-- 
With Best Regards,
Andy Shevchenko