linux-kernel - linux-next: manual merge of the drivers-x86 tree with the watchdog tree

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: <20170502140403.24e315cf@canb.auug.org.au>
Date:   Tue, 2 May 2017 14:04:03 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Darren Hart <dvhart@...radead.org>,
        Wim Van Sebroeck <wim@...ana.be>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kuppuswamy Sathyanarayanan 
        <sathyanarayanan.kuppuswamy@...ux.intel.com>
Subject: linux-next: manual merge of the drivers-x86 tree with the watchdog
 tree

Hi all,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  drivers/watchdog/iTCO_wdt.c

between commit:

  38a700fa1df9 ("watchdog: iTCO_wdt: cleanup set/unset no_reboot_bit functions")
(which also appears in the drivers-x86 tree as commit f583a884afec)

from the watchdog tree and commit:

  140c91b26ebc ("watchdog: iTCO_wdt: Add PMC specific noreboot update api")

from the drivers-x86 tree.

I fixed it up 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