lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160930134223.4eb0767d@canb.auug.org.au>
Date:   Fri, 30 Sep 2016 13:42:23 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Aleksey Makarov <aleksey.makarov@...aro.org>,
        Mika Westerberg <mika.westerberg@...ux.intel.com>
Subject: linux-next: manual merge of the tty tree with the pm tree

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*/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ