linux-stable.git/drivers/staging/sep, branch linux-3.5.y Linux kernel stable tree Merge 3.4-rc5 into staging-next 2012-05-02T18:48:07+00:00 Greg Kroah-Hartman gregkh@linuxfoundation.org 2012-05-02T18:48:07+00:00 d210267741fb2a8b6d741d9040703683a39087f4 This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging, sep: Fix typo in sep 2012-04-24T18:28:24+00:00 Masanari Iida standby24x7@gmail.com 2012-04-22T16:47:45+00:00 bb75f7dc948eb92b1d0612b4ddba23d2ecd553c5 Correct spelling typos in staging/sep. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Correct spelling typos in staging/sep.

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: sep: Fix sign of error 2012-04-10T16:14:39+00:00 Alan Cox alan@linux.intel.com 2012-03-21T12:32:32+00:00 fcff311c938c95c90573c060d37648df00e45017 One of our errors wasn't negative as intended. Fix this. (Found by Hillf Danton) While we are at it turn user causable messages down to dev_dbg level in the ioctl paths. Signed-off-by: Alan Cox <alan@linux.intel.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
One of our errors wasn't negative as intended. Fix this.
(Found by Hillf Danton)

While we are at it turn user causable messages down to dev_dbg level in the
ioctl paths.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: Fix SEP build 2012-02-13T22:42:02+00:00 Alan Cox alan@linux.intel.com 2012-02-13T22:37:20+00:00 ebb3bf50183f41327341da6f1e82b1fe1c058c12 SEP build fails if crypto is not selected. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
SEP build fails if crypto is not selected.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: sep: reworked crypto layer 2012-02-10T18:09:58+00:00 Mark A. Allyn mark.a.allyn@intel.com 2012-02-10T13:53:36+00:00 9196dc1129fbb3ecf93027224a6bdbc86d086e3a This gets the SEP crypto layer up and running with things like dmcrypt. It's a fairly big set of changes because it has to rework the whole context handling system. [This is picked out of the differences between the upstream driver and the staging driver. I'm resolving the differences as a series of updates -AC] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
This gets the SEP crypto layer up and running with things like dmcrypt.
It's a fairly big set of changes because it has to rework the whole context
handling system.

[This is picked out of the differences between the upstream driver and
 the staging driver. I'm resolving the differences as a series of updates -AC]

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: sep: NULL out pointers, mark debug code DEBUG to fix warnings 2012-02-10T18:09:58+00:00 Mark A. Allyn mark.a.allyn@intel.com 2012-02-10T13:53:21+00:00 ab8ef35131ee42963abe87b2b1d2911bda4a8a48 [This is picked out of the differences between the upstream driver and the staging driver. I'm resolving the differences as a series of updates -AC] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
[This is picked out of the differences between the upstream driver and
 the staging driver. I'm resolving the differences as a series of updates -AC]

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: sep: update initialisation 2012-02-10T18:09:57+00:00 Mark A. Allyn mark.a.allyn@intel.com 2012-02-10T13:53:08+00:00 ecd0cb003fda30702c6c1f007a58bef885f5cb42 In particular we want to always do the reconfigure [This is picked out of the differences between the upstream driver and the staging driver. I'm resolving the differences as a series of updates -AC] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
In particular we want to always do the reconfigure

[This is picked out of the differences between the upstream driver and
 the staging driver. I'm resolving the differences as a series of updates -AC]

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: sep: Add interfaces for the new functions 2012-02-10T18:09:57+00:00 Mark A. Allyn mark.a.allyn@intel.com 2012-02-10T13:52:55+00:00 6ab80c26085b91f4a6c0336bbc99b18e9938cfb2 [This is picked out of the differences between the upstream driver and the staging driver. I'm resolving the differences as a series of updates -AC] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
[This is picked out of the differences between the upstream driver and
 the staging driver. I'm resolving the differences as a series of updates -AC]

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: sep: Basic infrastructure for SEP DMA access to non CPU regions 2012-02-10T18:09:57+00:00 Mark A. Allyn mark.a.allyn@intel.com 2012-02-10T13:52:42+00:00 aca58ec828af52516816ec48e75a78f043e508c7 [This is picked out of the differences between the upstream driver and the staging driver. I'm resolving the differences as a series of updates -AC] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
[This is picked out of the differences between the upstream driver and
 the staging driver. I'm resolving the differences as a series of updates -AC]

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: sep: Add new PCI identifier 2012-02-10T18:09:56+00:00 Mark A. Allyn mark.a.allyn@intel.com 2012-02-10T13:52:27+00:00 ffcf12810ca11891deb580d166af13fae294fe2e [This is picked out of the differences between the upstream driver and the staging driver. I'm resolving the differences as a series of updates -AC] Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
[This is picked out of the differences between the upstream driver and
 the staging driver. I'm resolving the differences as a series of updates -AC]

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>