From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jeremy Fitzhardinge <jeremy@goop•org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
Stefano Stabellini <sstabellini@kernel•org>,
Xen Devel <Xen-devel@lists•xensource.com>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Octavian Purdila <octavian.purdila@intel•com>,
Shannon Zhao <shannon.zhao@linaro•org>
Subject: linux-next: manual merge of the xen-tip tree with the pm tree
Date: Tue, 12 Jul 2016 14:09:26 +1000 [thread overview]
Message-ID: <20160712140926.49958101@canb.auug.org.au> (raw)
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. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/acpi/scan.c
index 405056b95b05,cfc73fecaba4..000000000000
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1925,8 -1961,19 +1970,21 @@@ static int acpi_bus_scan_fixed(void
return result < 0 ? result : 0;
}
+ static void __init acpi_get_spcr_uart_addr(void)
+ {
+ acpi_status status;
+ struct acpi_table_spcr *spcr_ptr;
+
+ status = acpi_get_table(ACPI_SIG_SPCR, 0,
+ (struct acpi_table_header **)&spcr_ptr);
+ if (ACPI_SUCCESS(status))
+ spcr_uart_addr = spcr_ptr->serial_port.address;
+ else
+ printk(KERN_WARNING PREFIX "STAO table present, but SPCR is missing\n");
+ }
+
+static bool acpi_scan_initialized;
+
int __init acpi_scan_init(void)
{
int result;
next reply other threads:[~2016-07-12 4:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 4:09 Stephen Rothwell [this message]
2016-07-12 12:14 ` linux-next: manual merge of the xen-tip tree with the pm tree Rafael J. Wysocki
2016-07-12 15:31 ` Stefano Stabellini
-- strict thread matches above, loose matches on Subject: below --
2022-05-23 6:30 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160712140926.49958101@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=jeremy@goop$(echo .)org \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=octavian.purdila@intel$(echo .)com \
--cc=rjw@rjwysocki$(echo .)net \
--cc=shannon.zhao@linaro$(echo .)org \
--cc=sstabellini@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox