MIME-Version: 1.0
In-Reply-To: <20150810123729.58c74531@canb.auug.org.au>
References: <20150810123729.58c74531@canb.auug.org.au>
Date: Mon, 10 Aug 2015 13:07:11 +0900
Message-ID: <CAJKOXPcxoiOAMrrsmO5FR8Y+ZpeCfUfp7P4bMWBrWCVWKn8E7g@mail.gmail.com>
Subject: Re: linux-next: manual merge of the trivial tree with the regulator tree
From: =?UTF-8?Q?Krzysztof_Koz=C5=82owski?= <k.kozlowski.k@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jkosina@suse.cz>, Mark Brown <broonie@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 816
Lines: 29

2015-08-10 11:37 GMT+09:00 Stephen Rothwell <sfr@canb.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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/