From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932956Ab0D3Rd7 (ORCPT ); Fri, 30 Apr 2010 13:33:59 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:36099 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758801Ab0D3Rcg (ORCPT ); Fri, 30 Apr 2010 13:32:36 -0400 Date: Thu, 29 Apr 2010 15:50:04 +1000 From: Stephen Rothwell To: =?UTF-8?B?IkZyw6lkw6lyaWMgV2Vpc2JlY2tlciI=?= Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: linux-next: manual merge of the bkl-ioctl tree with the fixes tree Message-Id: <20100429155004.26148af5.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.0; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA1"; boundary="Signature=_Thu__29_Apr_2010_15_50_04_+1000_NQKzfK67SSvv/4Ui" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Signature=_Thu__29_Apr_2010_15_50_04_+1000_NQKzfK67SSvv/4Ui Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Fr=C3=A9d=C3=A9ric, Today's linux-next merge of the bkl-ioctl tree got a conflict in drivers/block/pktcdvd.c between commit db02df06864ed90b08771914ed3d50daca7cd8d7 ("pktcdvd: improve BKL and compat_ioctl.c usage") from the fixes tree and commit 59ce88717d9d8af8cb14af3a0a505cafb692b482 ("drivers: Push down BKL into various drivers") from the bkl-ioctl tree. I used the version from the fixes tree as that seems to be a superset (including removing the [un]lock_kernel() calls). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Signature=_Thu__29_Apr_2010_15_50_04_+1000_NQKzfK67SSvv/4Ui Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkvZHgwACgkQjjKRsyhoI8wKdACdGaS3X/C8AYan27tSfDjR3NZH tFcAn1Rjy27SiGgl3dbgac0E3EUz3vDh =I0ps -----END PGP SIGNATURE----- --Signature=_Thu__29_Apr_2010_15_50_04_+1000_NQKzfK67SSvv/4Ui--