linux-kernel - Re: linux-next: manual merge of the perf 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: <9FB29D99-7F54-428E-912A-A9B025FD7CF3@gmail.com>
Date:   Tue, 26 Oct 2021 20:06:10 -0300
From:   Arnaldo Carvalho de Melo <arnaldo.melo@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Alexey Bayduraev <alexey.v.bayduraev@...ux.intel.com>,
        Arnaldo Carvalho de Melo <acme@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the perf tree with Linus' tree



On October 26, 2021 7:17:05 PM GMT-03:00, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>Hi all,
>
>Today's linux-next merge of the perf tree got a conflict in:
>
>  tools/perf/util/session.c
>
>between commit:
>
>  8e820f962345 ("perf report: Output non-zero offset for decompressed records")
>
>from Linus' tree and commit:
>
>  3a3535e67dfd ("perf session: Introduce decompressor in reader object")
>
>from the perf 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.
>


Fixed locally, will publish tomorrow after regression tests finish.

- Arnaldo