From: Greg KH <gregkh@linuxfoundation.org>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: cw00.choi@samsung.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] include: extcon: Fix compilation error caused because of incomplete merge
Date: Fri, 16 Sep 2016 08:54:23 +0200 [thread overview]
Message-ID: <20160916065423.GA464@kroah.com> (raw)
In-Reply-To: <1474008547-20112-1-git-send-email-kishon@ti.com>
On Fri, Sep 16, 2016 at 12:19:07PM +0530, Kishon Vijay Abraham I wrote:
> Fix the following compilation error caused due to incomplete merge. This is
> observed if CONFIG_EXTCON is not set.
>
> In file included from ./include/linux/mfd/palmas.h:23:0,
> from drivers/input/misc/palmas-pwrbutton.c:22:
> ./include/linux/extcon.h: In function ‘extcon_sync’:
> ./include/linux/extcon.h:361:1: error: expected declaration specifiers before ‘<<’ token
> ./include/linux/extcon.h:370:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
> ./include/linux/extcon.h:376:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘>>’ token
> ./include/linux/extcon.h:381:1: error: expected declaration specifiers before ‘<<’ token
> ./include/linux/extcon.h:390:1: error: expected declaration specifiers or ‘...’ before ‘==’ token
> ./include/linux/extcon.h:476:11: warning: ‘struct extcon_specific_cable_nb’ declared inside parameter list [enabled by default]
> ./include/linux/extcon.h:476:11: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
> ./include/linux/extcon.h:474:19: error: storage class specified for parameter ‘extcon_register_interest’
> ./include/linux/extcon.h:474:19: warning: parameter ‘extcon_register_interest’ declared ‘inline’ [enabled by default]
> ./include/linux/extcon.h:477:1: warning: ‘always_inline’ attribute ignored [-Wattributes]
> ./include/linux/extcon.h:474:19: error: ‘no_instrument_function’ attribute applies only to functions
> ./include/linux/extcon.h:477:1: error: expected ‘;’, ‘,’ or ‘)’ before ‘{’ token
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
> include/linux/extcon.h | 29 -----------------------------
> 1 file changed, 29 deletions(-)
>
> diff --git a/include/linux/extcon.h b/include/linux/extcon.h
> index 2b9f151..b871c0c 100644
> --- a/include/linux/extcon.h
> +++ b/include/linux/extcon.h
> @@ -358,8 +358,6 @@ static inline int extcon_set_state_sync(struct extcon_dev *edev, unsigned int id
> }
>
> static inline int extcon_sync(struct extcon_dev *edev, unsigned int id)
> -<<<<<<< HEAD
> -=======
> {
> return 0;
> }
Ugh, what a mess :(
Now applied, thanks.
greg k-h
prev parent reply other threads:[~2016-09-16 6:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 6:49 [PATCH] include: extcon: Fix compilation error caused because of incomplete merge Kishon Vijay Abraham I
2016-09-16 6:54 ` Greg KH [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160916065423.GA464@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=cw00.choi@samsung.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.