Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1203750 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-10 04:40 +0200 |
| Last post | 2015-08-10 06:10 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the trivial tree with the regulator tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-10 04:40 +0200
Re: linux-next: manual merge of the trivial tree with the regulator tree Krzysztof Kozłowski <k.kozlowski.k@gmail.com> - 2015-08-10 06:10 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-10 04:40 +0200 |
| Subject | linux-next: manual merge of the trivial tree with the regulator tree |
| Message-ID | <pVLah-6c-1@gated-at.bofh.it> |
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
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/
[toc] | [next] | [standalone]
| From | Krzysztof Kozłowski <k.kozlowski.k@gmail.com> |
|---|---|
| Date | 2015-08-10 06:10 +0200 |
| Subject | Re: linux-next: manual merge of the trivial tree with the regulator tree |
| Message-ID | <pVMzn-2zZ-5@gated-at.bofh.it> |
| In reply to | #1203750 |
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/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web