From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arnd Bergmann <arnd@arndb.de>
Subject: Re: [PATCH] bitops: add _local bitops
Date: Wed, 9 May 2012 14:06:15 +0000
Message-ID: <201205091406.15627.arnd@arndb.de>
References: <20120509134528.GA18044@redhat.com>
Mime-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Cc: "H. Peter Anvin" <hpa@zytor.com>, Rob Landley <rob@landley.net>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, x86@kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	David Howells <dhowells@redhat.com>,
	Akinobu Mita <akinobu.mita@gmail.com>,
	Alexey Dobriyan <adobriyan@gmail.com>,
	Herbert Xu <herbert@gondor.hengli.com.au>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arch@vger.kernel.org, Gleb Natapov <gleb@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>, kvm@vger.kernel.org,
	Avi Kivity <avi@redhat.com>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	Linus Torvalds <torvalds@linux-foundation.org>
To: "Michael S. Tsirkin" <mst@redhat.com>
Return-path: <linux-doc-owner@vger.kernel.org>
In-Reply-To: <20120509134528.GA18044@redhat.com>
Sender: linux-doc-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

On Wednesday 09 May 2012, Michael S. Tsirkin wrote:
>  Documentation/atomic_ops.txt              |   19 ++++++
>  arch/x86/include/asm/bitops.h             |    1 +
>  include/asm-generic/bitops.h              |    1 +
>  include/asm-generic/bitops/local-atomic.h |   92 +++++++++++++++++++++++++++++
>  include/asm-generic/bitops/local.h        |   85 ++++++++++++++++++++++++++
>  include/linux/bitops.h                    |    8 +++
>  6 files changed, 206 insertions(+), 0 deletions(-)

Unless I'm misreading the patch, you have two versions of the same file here,
where one version should be enough.

Both versions look fine to me though, so if you remove one of them:

Acked-by: Arnd Bergmann <arnd@arndb.de>