Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dda922c8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents db3397b9 c46a024e

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ Description: Discover CPUs in the same CPU frequency coordination domain 
What:		/sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1}

Date:		August 2008

KernelVersion:	2.6.27

Contact:	discuss@x86-64.org

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Disable L3 cache indices



		These files exist in every CPU's cache/index3 directory. Each

Documentation/hwmon/tmp401

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Supported chips: 
    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html

  * Texas Instruments TMP435

    Prefix: 'tmp435'

    Addresses scanned: I2C 0x37, 0x48 - 0x4f

    Addresses scanned: I2C 0x48 - 0x4f

    Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html



Authors:

Documentation/target/tcmu-design.txt

+7 −26
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ Contents: 
  a) Discovering and configuring TCMU uio devices

  b) Waiting for events on the device(s)

  c) Managing the command ring

3) Command filtering and pass_level

4) A final note

3) A final note





TCM Userspace Design
@@ -324,7 +323,7 @@ int handle_device_events(int fd, void *map) 
  /* Process events from cmd ring until we catch up with cmd_head */

  while (ent != (void *)mb + mb->cmdr_off + mb->cmd_head) {



    if (tcmu_hdr_get_op(&ent->hdr) == TCMU_OP_CMD) {

    if (tcmu_hdr_get_op(ent->hdr.len_op) == TCMU_OP_CMD) {

      uint8_t *cdb = (void *)mb + ent->req.cdb_off;

      bool success = true;
@@ -339,8 +338,12 @@ int handle_device_events(int fd, void *map) 
        ent->rsp.scsi_status = SCSI_CHECK_CONDITION;

      }

    }

    else if (tcmu_hdr_get_op(ent->hdr.len_op) != TCMU_OP_PAD) {

      /* Tell the kernel we didn't handle unknown opcodes */

      ent->hdr.uflags |= TCMU_UFLAG_UNKNOWN_OP;

    }

    else {

      /* Do nothing for PAD entries */

      /* Do nothing for PAD entries except update cmd_tail */

    }



    /* update cmd_tail */
@@ -360,28 +363,6 @@ int handle_device_events(int fd, void *map) 
}





Command filtering and pass_level

--------------------------------



TCMU supports a "pass_level" option with valid values of 0 or 1.  When

the value is 0 (the default), nearly all SCSI commands received for

the device are passed through to the handler. This allows maximum

flexibility but increases the amount of code required by the handler,

to support all mandatory SCSI commands. If pass_level is set to 1,

then only IO-related commands are presented, and the rest are handled

by LIO's in-kernel command emulation. The commands presented at level

1 include all versions of:



READ

WRITE

WRITE_VERIFY

XDWRITEREAD

WRITE_SAME

COMPARE_AND_WRITE

SYNCHRONIZE_CACHE

UNMAP





A final note

------------

MAINTAINERS

+9 −8
Original line number Diff line number Diff line
@@ -2433,7 +2433,6 @@ L: linux-security-module@vger.kernel.org 
S:	Supported

F:	include/linux/capability.h

F:	include/uapi/linux/capability.h

F:	security/capability.c

F:	security/commoncap.c

F:	kernel/capability.c
@@ -3831,10 +3830,11 @@ M: David Woodhouse <dwmw2@infradead.org> 
L:	linux-embedded@vger.kernel.org

S:	Maintained



EMULEX LPFC FC SCSI DRIVER

M:	James Smart <james.smart@emulex.com>

EMULEX/AVAGO LPFC FC/FCOE SCSI DRIVER

M:	James Smart <james.smart@avagotech.com>

M:	Dick Kennedy <dick.kennedy@avagotech.com>

L:	linux-scsi@vger.kernel.org

W:	http://sourceforge.net/projects/lpfcxxxx

W:	http://www.avagotech.com

S:	Supported

F:	drivers/scsi/lpfc/
@@ -8835,9 +8835,11 @@ F: drivers/misc/phantom.c 
F:	include/uapi/linux/phantom.h



SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER

M:	Jayamohan Kallickal <jayamohan.kallickal@emulex.com>

M:	Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>

M:	Minh Tran <minh.tran@avagotech.com>

M:	John Soni Jose <sony.john-n@avagotech.com>

L:	linux-scsi@vger.kernel.org

W:	http://www.emulex.com

W:	http://www.avagotech.com

S:	Supported

F:	drivers/scsi/be2iscsi/
@@ -10591,8 +10593,7 @@ F: drivers/virtio/virtio_input.c 
F:	include/uapi/linux/virtio_input.h



VIA RHINE NETWORK DRIVER

M:	Roger Luethi <rl@hellgate.ch>

S:	Maintained

S:	Orphan

F:	drivers/net/ethernet/via/via-rhine.c



VIA SD/MMC CARD CONTROLLER DRIVER

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 1

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc6

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*