linux-kernel - linux-next: manual merge of the uuid tree with the arm64 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20170616152136.161630bf@canb.auug.org.au>
Date:   Fri, 16 Jun 2017 15:21:36 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christoph Hellwig <hch@....de>,
        Catalin Marinas <catalin.marinas@....com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Tyler Baicar <tbaicar@...eaurora.org>,
        Will Deacon <will.deacon@....com>
Subject: linux-next: manual merge of the uuid tree with the arm64 tree

Hi all,

Today's linux-next merge of the uuid tree got conflicts in:

  drivers/acpi/apei/ghes.c
  include/uapi/linux/uuid.h

between commits:

  f4dccde3f9b9 ("ras: acpi/apei: cper: add support for generic data v3 structure")
  476e4940c251 ("ras: acpi / apei: generate trace event for unrecognized CPER section")
  8a0456ea3dec ("trace, ras: add ARM processor error trace event")

from the arm64 tree and commit:

  60927bc31436 ("uuid: remove uuid_be defintions from the uapi header")
  f9727a17db9b ("uuid: rename uuid types")
  5b53696a30d5 ("ACPI / APEI: Switch to use new generic UUID API")

from the uuid tree.

I really can't fix this up, so can you guys get together and sort this
out, please.

For today, I have just dropped the uuid tree, sorry.



-- 
Cheers,
Stephen Rothwell