linux-kernel - Re: [PATCH] include: extcon: Fix compilation error caused because of incomplete merge

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 16 Sep 2016 08:54:23 +0200
From:   Greg KH <gregkh@...uxfoundation.org>
To:     Kishon Vijay Abraham I <kishon@...com>
Cc:     cw00.choi@...sung.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] include: extcon: Fix compilation error caused because of
 incomplete merge

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@...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