linux-kernel - Re: linux-next: manual merge of the trivial tree with the regulator 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 for Android: free password hash cracker in your pocket

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

Message-ID: <CAJKOXPcxoiOAMrrsmO5FR8Y+ZpeCfUfp7P4bMWBrWCVWKn8E7g@mail.gmail.com>
Date:	Mon, 10 Aug 2015 13:07:11 +0900
From:	Krzysztof Kozłowski <k.kozlowski.k@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Jiri Kosina <jkosina@...e.cz>, Mark Brown <broonie@...nel.org>,
	Liam Girdwood <lgirdwood@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the trivial tree with the regulator tree

2015-08-10 11:37 GMT+09:00 Stephen Rothwell <sfr@...b.auug.org.au>:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in:
>
>   drivers/regulator/max77843.c
>
> between commit:
>
>   2a32b401a11f ("regulator: Remove the max77843 driver")
>
> from the regulator tree and commit:
>
>   971bd8fa369a ("treewide: Fix typo in printk")
>
> from the trivial tree.
>
> I fixed it up (the former removed the file, so I did that) and can carry
> the fix as necessary (no action is required).

Thanks, that's the proper resolution.

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/