From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, "Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Aleksey Makarov <aleksey.makarov@linaro•org>,
Mika Westerberg <mika.westerberg@linux•intel.com>
Subject: linux-next: manual merge of the tty tree with the pm tree
Date: Fri, 30 Sep 2016 13:42:23 +1000 [thread overview]
Message-ID: <20160930134223.4eb0767d@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
include/linux/acpi.h
between commit:
058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog")
from the pm tree and commit:
ad1696f6f09d ("ACPI: parse SPCR and enable matching console")
from the tty 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 include/linux/acpi.h
index 19e650c940b6,2353827731d2..000000000000
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -1093,10 -1074,10 +1093,16 @@@ void acpi_table_upgrade(void)
static inline void acpi_table_upgrade(void) { }
#endif
+#if defined(CONFIG_ACPI) && defined(CONFIG_ACPI_WATCHDOG)
+extern bool acpi_has_watchdog(void);
+#else
+static inline bool acpi_has_watchdog(void) { return false; }
+#endif
+
+ #ifdef CONFIG_ACPI_SPCR_TABLE
+ int parse_spcr(bool earlycon);
+ #else
+ static inline int parse_spcr(bool earlycon) { return 0; }
+ #endif
+
#endif /*_LINUX_ACPI_H*/
next reply other threads:[~2016-09-30 3:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 3:42 Stephen Rothwell [this message]
2016-09-30 5:44 ` linux-next: manual merge of the tty tree with the pm tree Greg KH
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=20160930134223.4eb0767d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aleksey.makarov@linaro$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mika.westerberg@linux$(echo .)intel.com \
--cc=rjw@rjwysocki$(echo .)net \
/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