From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ulrich Drepper Subject: Re: F_SETOWN_EX and F_GETLK64 conflict Date: Thu, 29 Oct 2009 20:21:02 -0700 Message-ID: References: <1254691822.21044.9.camel@laptop> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1254691822.21044.9.camel@laptop> Sender: linux-kernel-owner@vger.kernel.org To: Peter Zijlstra Cc: "Joseph S. Myers" , linux-api@vger.kernel.org, lkml , Oleg Nesterov , Stephane Eranian , Michael Kerrisk , Roland McGrath , Al Viro , Christoph Hellwig , Andrew Morton , Ingo Molnar List-Id: linux-api@vger.kernel.org On Sun, Oct 4, 2009 at 14:30, Peter Zijlstra w= rote: > =C2=A0arch/alpha/include/asm/fcntl.h | =C2=A0 =C2=A04 ++-- > =C2=A0include/asm-generic/fcntl.h =C2=A0 =C2=A0| =C2=A0 19 ++++++++++= +-------- > =C2=A02 files changed, 13 insertions(+), 10 deletions(-) This patch looks fine: Acked-by: Ulrich Drepper Linus, can you please apply it in whatever form so that we know the value of the constants?