Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755130AbZINDEF (ORCPT ); Sun, 13 Sep 2009 23:04:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754877AbZINDED (ORCPT ); Sun, 13 Sep 2009 23:04:03 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:49156 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754644AbZINDEC (ORCPT ); Sun, 13 Sep 2009 23:04:02 -0400 Date: Mon, 14 Sep 2009 13:03:55 +1000 From: Stephen Rothwell To: Russell King Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mikael Pettersson , James Morris , David Howells Subject: Re: linux-next: manual merge of the security-testing tree with the arm tree Message-Id: <20090914130355.ff26d669.sfr@canb.auug.org.au> In-Reply-To: <20090903154700.2d4538cf.sfr@canb.auug.org.au> References: <20090903154700.2d4538cf.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Mon__14_Sep_2009_13_03_55_+1000_kwZSGr4wddKi6r7Z" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2388 Lines: 67 --Signature=_Mon__14_Sep_2009_13_03_55_+1000_kwZSGr4wddKi6r7Z Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Russell, On Thu, 3 Sep 2009 15:47:00 +1000 Stephen Rothwell w= rote: > > Today's linux-next merge of the security-testing tree got a conflicts in > arch/arm/kernel/signal.c between commit > 369842658a36bcea28ecb643ba4bdb53919330dd ("ARM: 5677/1: ARM support for > TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait") from the arm tree and > commits d0420c83f39f79afb82010c2d2cafd150eef651b ("KEYS: Extend > TIF_NOTIFY_RESUME to (almost) all architectures [try #6]") and > ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a keyctl to install > a process's session keyring on its parent [try #6]") from the > security-testing tree. >=20 > Just context changes. I fixed it up (see below) and can carry the fix as > necessary. This is now a conflict between the arm tree and Linus' tree (as the security-testing tree has been merged). > diff --cc arch/arm/kernel/signal.c > index f7194e4,ea4ad3a..0000000 > --- a/arch/arm/kernel/signal.c > +++ b/arch/arm/kernel/signal.c > @@@ -694,5 -706,12 +694,12 @@@ asmlinkage voi > do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int s= yscall) > { > if (thread_flags & _TIF_SIGPENDING) > - do_signal(¤t->blocked, regs, syscall); > + do_signal(regs, syscall); > +=20 > + if (thread_flags & _TIF_NOTIFY_RESUME) { > + clear_thread_flag(TIF_NOTIFY_RESUME); > + tracehook_notify_resume(regs); > + if (current->replacement_session_keyring) > + key_replace_session_keyring(); > + } > } --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ --Signature=_Mon__14_Sep_2009_13_03_55_+1000_kwZSGr4wddKi6r7Z Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkqtspsACgkQjjKRsyhoI8wHhwCcDx7LRGRRJIDFOftZoooILpfR +58An31DQz9jmwkqstQPgaz2bOoqrxoX =Qq7L -----END PGP SIGNATURE----- --Signature=_Mon__14_Sep_2009_13_03_55_+1000_kwZSGr4wddKi6r7Z-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/