From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757581AbbKFQ6K (ORCPT ); Fri, 6 Nov 2015 11:58:10 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:62336 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755516AbbKFQ6H (ORCPT ); Fri, 6 Nov 2015 11:58:07 -0500 From: Arnd Bergmann To: torvalds@linux-foundation.org, Christoph Hellwig Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] asm-generic cleanups Date: Fri, 06 Nov 2015 17:57:38 +0100 Message-ID: <33040668.avNmVjd66u@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:6kohs5Zz+WXpw1C6wLy2QvzJRyJ9DghuxATAJNhQiuN5UTWTqzg VUnFd/3MUutbJ2TDLOAT3ZdRs40YSaEy09WFduCUgdO1yP71DqD4ErSDBRHX2lvBtB8XFn0 U7UWspDKlLU5MAkSdPuR4xQxfGjnjckqBVllngBo7U6+VSPTBC5RwZnts+0IUOEFylBg+NH HpaH3VdHdtU1QZ8eqSwFA== X-UI-Out-Filterresults: notjunk:1;V01:K0:pA5RSsTOdRs=:cpD89x5aNhBwCHkv0Tx1MP jRnF3DHZSzAPOcjqr+OsbMHb4RcUdiijX0xGp6xT9x/r7gz9AsSjqvEENnUUBLH0XmWdm1Qa9 URrsywbbKhzqVSqt+IMAjI4rYKd6nPDy/dLafndUdpC1BwiUsUjsBmTubOTMe9xZfSVjQh1CL ljUWyYmFmilxycKe6aElZy+2bRF7pPVxabK6rtpDlMhDUxipxC+QdyWy6j60lv781IZyeWKZg Q8ICeet7IaYgKiWTVMfh4WISxLR/dq/oRl89pFtrJIhtZzX2lxpY612wAyK4voFZygO8kNjdW qc4cHb5vWlZxQ+DqWF3/xjS+potLMhPYITI0OSlKGa3DDHT2Qyxw1onM4eA8cEDp4q79dO10D 8xdLpdZ13tZ3WuhHgjyJE+pZw8lhNlh+AkyZHL52iUGHH4Mz89Qr1+241QtfWjPngTzrl1RpM ThnS7TrWRTm3b+/SloTCNFj6WcRAtDowBQHdG1A8EDQDXMrX9McKEvWAilXR/gHVb2DvM6tBK ckK6of5Oogz6BE3R0X/Iwv1m01BRuypyodv2GZIY+b5AV7UR1/+WId1kyuoRS/uAISnsJpWtX AEci8orVXWYc7SFBgpm4emcvRHDX2A/xIuL38bDXZMjgX/IvDMrjphTiesR/hJdXpese1cFsT ZH1Tjsc9zd15Yq/3RlCkx3ub0H9/Z8xMu7NJahj4IO/qOujLbJ5fjz3bTEN7CR/3ZPBQfzrFo p99Kc+iaPtGL3/s2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following changes since commit 049e6dde7e57f0054fdc49102e7ef4830c698b46: Linux 4.3-rc4 (2015-10-04 16:57:17 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git tags/asm-generic-for-linus for you to fetch changes up to 4008cb3ad223e39273b9cdfa578d04861b197c86: asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h (2015-10-16 12:08:53 +0200) ---------------------------------------------------------------- asm-generic cleanups The asm-generic changes for 4.4 are mostly a series from Christoph Hellwig to clean up various abuses of headers in there. The patch to rename the io-64-nonatomic-*.h headers caused some conflicts with new users, so I added a workaround that we can remove in the next merge window. The only other patch is a warning fix from Marek Vasut ---------------------------------------------------------------- Arnd Bergmann (1): asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h Christoph Hellwig (8): move io-64-nonatomic*.h out of asm-generic move count_zeroes.h out of asm-generic drbd: stop including hifn_795x: stop including mlx5: stop including n_tracerouter: stop including n_tracesink: stop including gpio-mxc: stop including Marek Vasut (1): asm-generic: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations drivers/acpi/nfit.c | 2 +- drivers/acpi/osl.c | 2 +- drivers/block/drbd/drbd_bitmap.c | 2 +- drivers/block/nvme-core.c | 2 +- drivers/crypto/hifn_795x.c | 2 -- drivers/edac/i3200_edac.c | 2 +- drivers/edac/ie31200_edac.c | 2 +- drivers/edac/x38_edac.c | 2 +- drivers/gpio/gpio-mxc.c | 2 +- drivers/i2c/busses/i2c-ismt.c | 2 +- drivers/infiniband/hw/mlx5/main.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_osdep.h | 2 +- drivers/net/ethernet/intel/i40evf/i40e_osdep.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 2 +- drivers/net/ethernet/rocker/rocker.c | 2 +- drivers/platform/x86/ibm_rtl.c | 2 +- drivers/platform/x86/intel_ips.c | 2 +- drivers/scsi/qla4xxx/ql4_nx.c | 2 +- drivers/tty/n_tracerouter.c | 2 +- drivers/tty/n_tracesink.c | 2 +- include/asm-generic/cmpxchg.h | 11 ++++--- include/asm-generic/io-64-nonatomic-hi-lo.h | 34 ++-------------------- include/asm-generic/io-64-nonatomic-lo-hi.h | 34 ++-------------------- .../{asm-generic/bitops => linux}/count_zeros.h | 6 ++-- include/linux/io-64-nonatomic-hi-lo.h | 32 ++++++++++++++++++++ include/linux/io-64-nonatomic-lo-hi.h | 32 ++++++++++++++++++++ lib/mpi/longlong.h | 2 +- lib/mpi/mpicoder.c | 2 +- 30 files changed, 101 insertions(+), 96 deletions(-) rename include/{asm-generic/bitops => linux}/count_zeros.h (92%) create mode 100644 include/linux/io-64-nonatomic-hi-lo.h create mode 100644 include/linux/io-64-nonatomic-lo-hi.h