From: Arnaldo Carvalho de Melo <arnaldo.melo@gmail•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux•intel.com>,
Arnaldo Carvalho de Melo <acme@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the perf tree with Linus' tree
Date: Tue, 26 Oct 2021 20:06:10 -0300 [thread overview]
Message-ID: <9FB29D99-7F54-428E-912A-A9B025FD7CF3@gmail.com> (raw)
In-Reply-To: <20211027091705.1e24694e@canb.auug.org.au>
On October 26, 2021 7:17:05 PM GMT-03:00, Stephen Rothwell <sfr@canb•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
next prev parent reply other threads:[~2021-10-26 23:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 22:17 linux-next: manual merge of the perf tree with Linus' tree Stephen Rothwell
2021-10-26 23:06 ` Arnaldo Carvalho de Melo [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-07 23:28 Stephen Rothwell
2023-11-28 21:53 Stephen Rothwell
2023-11-30 0:11 ` Namhyung Kim
2024-10-31 23:33 Stephen Rothwell
2024-11-04 18:11 ` Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9FB29D99-7F54-428E-912A-A9B025FD7CF3@gmail.com \
--to=arnaldo.melo@gmail$(echo .)com \
--cc=acme@redhat$(echo .)com \
--cc=alexey.v.bayduraev@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox