Merge branch 'sh/stable-updates' (95019b48) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/scsi/hptiop.txt

+20 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,25 @@ HIGHPOINT ROCKETRAID 3xxx/4xxx ADAPTER DRIVER (hptiop)
		Controller Register Map
		-------------------------

		For RR44xx Intel IOP based adapters, the controller IOP is accessed via PCI BAR0 and BAR2:

		BAR0 offset Register
		0x11C5C Link Interface IRQ Set
		0x11C60 Link Interface IRQ Clear

		BAR2 offset Register
		0x10 Inbound Message Register 0
		0x14 Inbound Message Register 1
		0x18 Outbound Message Register 0
		0x1C Outbound Message Register 1
		0x20 Inbound Doorbell Register
		0x24 Inbound Interrupt Status Register
		0x28 Inbound Interrupt Mask Register
		0x30 Outbound Interrupt Status Register
		0x34 Outbound Interrupt Mask Register
		0x40 Inbound Queue Port
		0x44 Outbound Queue Port

		For Intel IOP based adapters, the controller IOP is accessed via PCI BAR0:

		BAR0 offset Register
		@@ -93,7 +112,7 @@ The driver exposes following sysfs attributes:


		-----------------------------------------------------------------------------
		Copyright (C) 2006-2007 HighPoint Technologies, Inc. All Rights Reserved.
		Copyright (C) 2006-2009 HighPoint Technologies, Inc. All Rights Reserved.

		This file is distributed in the hope that it will be useful,
		but WITHOUT ANY WARRANTY; without even the implied warranty of

+21 −1

Original line number	Diff line number	Diff line
		@@ -577,6 +577,11 @@ M: Mike Rapoport <mike@compulab.co.il>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained

		ARM/CONTEC MICRO9 MACHINE SUPPORT
		M: Hubert Feurstein <hubert.feurstein@contec.at>
		S: Maintained
		F: arch/arm/mach-ep93xx/micro9.c

		ARM/CORGI MACHINE SUPPORT
		M: Richard Purdie <rpurdie@rpsys.net>
		S: Maintained
		@@ -1231,6 +1236,13 @@ L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/tg3.*

		BROCADE BFA FC SCSI DRIVER
		P: Jing Huang
		M: huangj@brocade.com
		L: linux-scsi@vger.kernel.org
		S: Supported
		F: drivers/scsi/bfa/

		BSG (block layer generic sg v4 driver)
		M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
		L: linux-scsi@vger.kernel.org
		@@ -2058,7 +2070,7 @@ S: Maintained
		F: fs/*

		FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
		M: Riku Voipio <riku.vipio@iki.fi>
		M: Riku Voipio <riku.voipio@iki.fi>
		L: lm-sensors@lm-sensors.org
		S: Maintained
		F: drivers/hwmon/f75375s.c
		@@ -4646,6 +4658,14 @@ F: drivers/ata/
		F: include/linux/ata.h
		F: include/linux/libata.h

		SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
		P: Jayamohan Kallickal
		M: jayamohank@serverengines.com
		L: linux-scsi@vger.kernel.org
		W: http://www.serverengines.com
		S: Supported
		F: drivers/scsi/be2iscsi/

		SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
		M: Sathya Perla <sathyap@serverengines.com>
		M: Subbu Seetharaman <subbus@serverengines.com>

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 32
		EXTRAVERSION = -rc3
		EXTRAVERSION = -rc4
		NAME = Man-Eating Seals of Antiquity

		# DOCUMENTATION

+3 −3

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ ____atomic_test_and_set_bit(unsigned int bit, volatile unsigned long *p)
		*p = res \| mask;
		raw_local_irq_restore(flags);

		return res & mask;
		return (res & mask) != 0;
		}

		static inline int
		@@ -101,7 +101,7 @@ ____atomic_test_and_clear_bit(unsigned int bit, volatile unsigned long *p)
		*p = res & ~mask;
		raw_local_irq_restore(flags);

		return res & mask;
		return (res & mask) != 0;
		}

		static inline int
		@@ -118,7 +118,7 @@ ____atomic_test_and_change_bit(unsigned int bit, volatile unsigned long *p)
		*p = res ^ mask;
		raw_local_irq_restore(flags);

		return res & mask;
		return (res & mask) != 0;
		}

		#include <asm-generic/bitops/non-atomic.h>

+1 −0