linux-kernel - Re: linux-next: manual merge of the parisc 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20091009183914.GG11702@bombadil.infradead.org>
Date:	Fri, 9 Oct 2009 14:39:14 -0400
From:	Kyle McMartin <kyle@...artin.ca>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Kyle McMartin <kyle@...artin.ca>, linux-parisc@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>
Subject: Re: linux-next: manual merge of the parisc tree with Linus' tree

On Fri, Oct 09, 2009 at 11:21:58AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the parisc tree got conflicts in
> arch/parisc/include/asm/thread_info.h and arch/parisc/kernel/entry.S
> between commit d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend
> TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") from Linus'
> tree and commit 9f4259771faf1ffd99888796d925adae4c93630b ("parisc: add
> TIF_NOTIFY_RESUME and use tracehook_notify_resume") from the parisc tree.
> 
> It looks like the parisc tree version is a superset of the version in
> Linus' tree (for parisc).  I fixed it up (hopefully - using the parisc
> tree versions) and can carry the fix for a while.

Sorry, forgot to push out a new #next. Should be sorted now.

Thanks for the heads up.
 - Kyle
--
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/