linux-kernel - Re: linux-next: manual merge of the dmi tree with Linus' 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-prev] [day] [month] [year] [list]

Message-ID: <20180904145152.5dae4343@endymion>
Date:   Tue, 4 Sep 2018 14:51:52 +0200
From:   Jean Delvare <jdelvare@...e.de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kai Heng Feng <kai.heng.feng@...onical.com>,
        "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Subject: Re: linux-next: manual merge of the dmi tree with Linus' tree

Hi Stephen,

On Tue, 4 Sep 2018 09:19:50 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the dmi tree got a conflict in:
> 
>   drivers/acpi/bus.c
> 
> between commit:
> 
>   ae976358cd7b ("Revert "ACPI / bus: Parse tables as term_list for Dell XPS 9570 and Precision M5530"")
> 
> from Linus' tree and commit:
> 
>   767b174cad46 ("ACPI / bus: Only call dmi_check_system on X86")
> 
> from the dmi 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.

Thanks for the heads up. I have rebased my dmi tree on top of 4.19-rc2,
and this solves the conflict.

-- 
Jean Delvare
SUSE L3 Support