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

Commit f407a825 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core, to resolve conflict 



Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 960d447b 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/devicetree/bindings/clock/silabs,si5351.txt

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ Required properties: 
- #clock-cells: from common clock binding; shall be set to 1.

- clocks: from common clock binding; list of parent clock

  handles, shall be xtal reference clock or xtal and clkin for

  si5351c only.

  si5351c only. Corresponding clock input names are "xtal" and

  "clkin" respectively.

- #address-cells: shall be set to 1.

- #size-cells: shall be set to 0.
@@ -71,6 +72,7 @@ i2c-master-node { 


		/* connect xtal input to 25MHz reference */

		clocks = <&ref25>;

		clock-names = "xtal";



		/* connect xtal input as source of pll0 and pll1 */

		silabs,pll-source = <0 0>, <1 0>;

Documentation/devicetree/bindings/net/cdns-emac.txt

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
Required properties:

- compatible: Should be "cdns,[<chip>-]{emac}"

  Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.

  or the generic form: "cdns,emac".

  Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

  Or the generic form: "cdns,emac".

- reg: Address and length of the register set for the device

- interrupts: Should contain macb interrupt

- phy-mode: see ethernet.txt file in the same directory.

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

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