linux-kernel - Re: linux-next: manual merge of the mips 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: <20091215192714.GB18592@linux-mips.org>
Date:	Tue, 15 Dec 2009 19:27:14 +0000
From:	Ralf Baechle <ralf@...ux-mips.org>
To:	Michal Simek <monstr@...str.eu>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Li Hong <lihong.hi@...il.com>,
	Wu Zhangjin <wuzhangjin@...il.com>
Subject: Re: linux-next: manual merge of the mips tree with Linus' tree

On Tue, Dec 15, 2009 at 08:26:42AM +0100, Michal Simek wrote:

> >Today's linux-next merge of the mips tree got a conflict in
> >scripts/recordmcount.pl between commits
> >e2d753fac5b3954a3b6001f98479f0435fe7c868 ("tracing: Correct the check for
> >number of arguments in recordmcount.pl") and
> >7d241ff0567b9503d79ee775c40927d09b509f83 ("microblaze: ftrace: Add
> >dynamic trace support") from Linus' tree and commits
> >84bc2d35f211a83e806711c94f78a227c4810848 ("MIPS: Tracing: Add an endian
> >argument to scripts/recordmcount.pl") and
> >b2b11a5cb24b8f234bc4746dc40722b01fa45a43 ("MIPS: Tracing: Add dynamic
> >function tracer support") from the mips tree.
> >
> >These conflicts are now between Linus' tree and the mips tree so, Ralf,
> >you should be able to fix them up by merging with Linus' tree.
> >
> >I have fixed them up (see below) (for the first pair of commits above, I
> >used the mips tree version) and can carry the fix for a while.
> 
> Yes, because I sent pull request to Linus and he added Microblaze
> patches to his tree. Sorry for this additional work but you had
> chance to pull your tree first.

No problem.   That's sorted and new pull rq is out.

  Ralf
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/