Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1441297
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the xen-tip tree with the pm tree |
| Date | 2016-07-12 14:10 +0200 |
| Message-ID | <rU4FI-4He-19@gated-at.bofh.it> (permalink) |
| References | <rTXbb-8eD-21@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Tuesday, July 12, 2016 02:09:26 PM Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in:
>
> drivers/acpi/scan.c
>
> between commit:
>
> 68bdb6773289 ("ACPI: add support for ACPI reconfiguration notifiers")
>
> from the pm tree and commit:
>
> c8ac8b6fb495 ("Xen: ACPI: Hide UART used by Xen")
>
> from the xen-tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks Stehpen!
Best,
Rafael
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the xen-tip tree with the pm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-12 06:10 +0200
Re: linux-next: manual merge of the xen-tip tree with the pm tree "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-07-12 14:10 +0200
Re: linux-next: manual merge of the xen-tip tree with the pm tree Stefano Stabellini <sstabellini@kernel.org> - 2016-07-12 17:40 +0200
csiph-web