linux-kernel - Re: linux-next: manual merge of the battery tree with the hid tree

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] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 20 Mar 2015 08:58:38 +0100
From:	Krzysztof Kozlowski <k.kozlowski@...sung.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Sebastian Reichel <sre@...nel.org>, Jiri Kosina <jikos@...os.cz>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Krzysztof Kozlowski <k.kozlowski@...sung.com>,
	Jason Gerecke <killertofu@...il.com>
Subject: Re: linux-next: manual merge of the battery tree with the hid tree

2015-03-20 5:11 GMT+01:00 Stephen Rothwell <sfr@...b.auug.org.au>:
> Hi Sebastian,
>
> Today's linux-next merge of the battery tree got conflicts in
> drivers/hid/wacom.h and drivers/hid/wacom_sys.c between commit
> 953f2c5f7163 ("HID: wacom: Centralize updating of wacom_wac battery
> status") and fce9957d8f61 ("HID: wacom: Allow dynamic battery
> creation/destruction") from the hid tree and commit 297d716f6260
> ("power_supply: Change ownership from driver to core") from the battery
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).  I also applied the following merge fixup patch.
>
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Fri, 20 Mar 2015 14:59:36 +1100
> Subject: [PATCH] HID: wacom: merge fix for "Change ownership from driver to core"
>
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/hid/wacom_wac.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
> index 5588ba80ede9..57ee0d807af1 100644
> --- a/drivers/hid/wacom_wac.c
> +++ b/drivers/hid/wacom_wac.c
> @@ -62,7 +62,7 @@ static void wacom_notify_battery(struct wacom_wac *wacom_wac,
>                 wacom_wac->ps_connected = ps_connected;
>
>                 if (wacom->battery.dev)

Should be:
if (wacom->battery)

Rest of patch looks fine but indeed some more changes are required.

How about preparing an immutable branch from HID or battery tree so we
could resolve these conflicts easily?

Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/