OSDN Git Service
Elena Ufimtseva [Wed, 15 May 2013 21:45:56 +0000 (17:45 -0400)]
Staging:
ced1401: Patch fixes missing parentheses in macro definitions.
Patch fixes missing parentheses in macro definitions.
Signed-off-by: Elena Ufimtseva <ufimtseva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hema Prathaban [Tue, 14 May 2013 15:31:22 +0000 (21:01 +0530)]
staging: rtl8192e: Use kmemdup for duplicating memory
Instead of allocating memory (kmalloc) and copying (memcpy)
from source, memory can be duplicated using kmemdup
Signed-off-by: Hema Prathaban <hemaklnce@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hema Prathaban [Tue, 14 May 2013 15:29:19 +0000 (20:59 +0530)]
staging: rtl8192e: Fix potential null dereference
check memory is allocated in '*challenge' before using it.
Signed-off-by: Hema Prathaban <hemaklnce@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Elena Ufimtseva [Wed, 15 May 2013 16:57:19 +0000 (12:57 -0400)]
Staging:
ced1401: Fixes trailing whitespace checkpath warning.
Fixes trailing whitespace checkpath warning.
Signed-off-by: Elena Ufimtseva <ufimtseva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Elena Ufimtseva [Wed, 15 May 2013 16:57:18 +0000 (12:57 -0400)]
Staging:
ced1401: Fixes 'open brace should be on the previous line'.
Fixes checkpatch warnings 'open brace should be on the previous line'.
Signed-off-by: Elena Ufimtseva <ufimtseva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Elena Ufimtseva [Wed, 15 May 2013 16:57:17 +0000 (12:57 -0400)]
Staging:
ced1401: Fixes white spaces and indentations.
Fixes white spaces and indentations warnings from checkpatch.
Signed-off-by: Elena Ufimtseva <ufimtseva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Elena Ufimtseva [Wed, 15 May 2013 16:57:16 +0000 (12:57 -0400)]
Staging:
ced1401: Fixes C pointer format warnings
Fixes checkpatch warnings about C pointer format.
Signed-off-by: Elena Ufimtseva <ufimtseva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Elena Ufimtseva [Wed, 15 May 2013 16:57:15 +0000 (12:57 -0400)]
Staging:
ced1401: Fixes C99 // comments.
Patch fixes checkpatch warnings about C99 // comments.
Signed-off-by: Elena Ufimtseva <ufimtseva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Peng Tao [Thu, 2 May 2013 08:46:55 +0000 (16:46 +0800)]
staging: add Lustre file system client support
Lustre is the most deployed distributed file system
in the HPC (High Performance Computing) world. The patch
adds its client side support.
The code is not very clean and needs to live in drivers/staging
for some time for continuing cleanup work. See
drivers/staging/lustre/TODO for details.
The code is based on Lustre master commit
faefbfc04
commit
faefbfc0460bc00f2ee4c1c1c86aa1e39b9eea49
Author: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Date: Tue Apr 30 23:05:21 2013 +0400
LU-3244 utils: tunefs.lustre should preserve virgin label
Plus a few under-review patches on Whamcloud gerrit:
3.8 kernel support:
http://review.whamcloud.com/#change,5973
http://review.whamcloud.com/#change,5974
http://review.whamcloud.com/#change,5768
http://review.whamcloud.com/#change,5781
http://review.whamcloud.com/#change,5763
http://review.whamcloud.com/#change,5613
http://review.whamcloud.com/#change,5655
3.9 kernel support:
http://review.whamcloud.com/#change,5898
http://review.whamcloud.com/#change,5899
Kconfig/Kbuild:
http://review.whamcloud.com/#change,4646
http://review.whamcloud.com/#change,4644
libcfs cleanup:
http://review.whamcloud.com/#change,2831
http://review.whamcloud.com/#change,4775
http://review.whamcloud.com/#change,4776
http://review.whamcloud.com/#change,4777
http://review.whamcloud.com/#change,4778
http://review.whamcloud.com/#change,4779
http://review.whamcloud.com/#change,4780
All starting/trailing whitespaces are removed, to match kernel
coding style. Also ran scripts/cleanfile on all lustre source files.
[maked the Kconfig depend on BROKEN as the recent procfs changes causes
this to fail - gregkh]
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Andres More [Sat, 27 Apr 2013 18:07:35 +0000 (13:07 -0500)]
staging: vt6656: remove unused definitions
remove 802.3 header plus two unused macros
Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chen Gang [Thu, 2 May 2013 09:05:28 +0000 (17:05 +0800)]
staging: for dgrp, let nd_ps_desc always NUL terminated string within MAX_DESC_LEN length
Use strlcpy instead of strncpy to let nd_ps_desc always NUL terminated.
Change nd_ps_desc in nd_struct struct to MAX_DESC_LEN to avoid the
confusion (the related length checking also need be changed to
MAX_DESC_LEN - 1).
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Chen Gang [Fri, 26 Apr 2013 10:31:58 +0000 (18:31 +0800)]
staging: wlags49_h2: strncpy, need checking the memory length
HCF_MAX_NAME_LEN is 32, which may less than ''probe_rsp->rawData[1]'',
so need check the length when copy to ssid.
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eduardo Valentin [Wed, 24 Apr 2013 18:16:08 +0000 (14:16 -0400)]
staging: ti-soc-thermal: remove external heat while extrapolating hotspot
For boards that provide a PCB sensor close to SoC junction
temperature, it is possible to remove the cumulative heat
reported by the SoC temperature sensor.
This patch changes the extrapolation computation to consider
an external sensor in the extrapolation equations.
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Eduardo Valentin [Wed, 24 Apr 2013 18:16:07 +0000 (14:16 -0400)]
staging: ti-soc-thermal: update DT reference for OMAP5430
Add missing irq line for TALERT on DT entry for OMAP5430.
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Wei Yongjun [Thu, 25 Apr 2013 09:32:16 +0000 (17:32 +0800)]
staging: ozwpan: fix error return code in oz_cdev_register()
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dan Carpenter [Thu, 9 May 2013 18:31:59 +0000 (21:31 +0300)]
staging: speakup: cleanup spk_var_header_by_name()
There is a confusing while loop here and I have re-written it in
canonical for loop format. Also I reversed the NULL check on "name" and
pulled everything in one tab stop.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
William Hubbs [Sun, 12 May 2013 18:49:54 +0000 (13:49 -0500)]
staging: speakup: update Kirk's email address
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Wei Yongjun [Mon, 13 May 2013 06:04:58 +0000 (14:04 +0800)]
staging: slicoss: fix error return code in slic_entry_probe()
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Marc Dietrich [Mon, 29 Apr 2013 21:14:52 +0000 (23:14 +0200)]
staging: nvec: cleanup childs on remove
Disable device functions and unregister notifier if available. The
serio device must not be "kzallocated". Otherwise serio_unregister_port
will fail because the device is already freed.
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Marc Dietrich [Mon, 29 Apr 2013 21:14:51 +0000 (23:14 +0200)]
staging: nvec: implement unregistering of notifiers
This implements the unregistering of notifiers so kernel modules
can be unloaded.
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Marc Dietrich [Mon, 29 Apr 2013 21:14:50 +0000 (23:14 +0200)]
staging: nvec: add missing module aliases
Keyboard and mouse drivers were missing MODULE_ALIAS
definitions. This fixes auto module loading of these
drivers.
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Alexey Khoroshilov [Tue, 23 Apr 2013 23:27:39 +0000 (19:27 -0400)]
staging: wlags49_h2: fix error handling in pcmcia probe function
wl_adapter_attach() ignores some important issues
such as register_netdev() failure. The patch fixes it.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Wei Yongjun [Wed, 24 Apr 2013 02:40:00 +0000 (10:40 +0800)]
staging: cptm1217: don't call input_free_device() after input_unregister_device()
input_free_device() should only be used if input_register_device()
was not called yet or if it failed. Once device was unregistered
use input_unregister_device() and memory will be freed once last
reference to the device is dropped.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Thu, 25 Apr 2013 01:13:24 +0000 (18:13 -0700)]
staging: comedi: remove FSF address from boilerplate text
Addresses change...
Remove the paragraph with the FSF address from all the comedi source
files.
Also, remove the paragraph about the finding the complete GPL in the
COPYING file since it's unnecessary.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Wei Yongjun [Mon, 13 May 2013 06:05:38 +0000 (14:05 +0800)]
staging: vme: fix error return code in vme_user_probe()
Fix to return -ENOMEM in the resource alloc error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Tue, 23 Apr 2013 19:57:58 +0000 (12:57 -0700)]
staging: comedi: ni_labpc: remove range_labpc_1200_ai export
The 'ai_range_table' boardinfo is only used to initialize the
analog input subdevice s->range_table. We can use the 'is_labpc1200'
flag in the boardinfo to determine which range table is needed.
This allows making range_labpc_1200_ai static and removing the
export as well as removing the 'ai_range_table' from the boardinfo.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Tue, 23 Apr 2013 19:57:38 +0000 (12:57 -0700)]
staging: comedi: ni_labpc: cleanup true/false flags in boardinfo
The 'register_layout' in the boardinfo can be represented as
a true/false flag instead of an enum. Rename the variable to
'is_labpc1200' and change it to an unsigned 1-bit bit-field.
The 'has_ao' variable is also a true/false flag. Change it to
an unsigned 1-bit bit-field.
Reorder the boardinfo data so that the bit-field data is grouped
together.
For aesthetic reasons, and move the 'const' variables then
reorder the boardinfo declarations to match the definition.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
H Hartley Sweeten [Tue, 23 Apr 2013 19:57:17 +0000 (12:57 -0700)]
staging: comedi: ni_labpc: remove 'device_id' from boardinfo
This information in the boardinfo is not used. Remove it.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amarjargal Gundjalam [Mon, 13 May 2013 10:27:33 +0000 (03:27 -0700)]
staging/crystalhd: Fixes line over 80 characters warning in bc_dts_glob_lnx.h
Fixes the following checkpatch warning
WARNING: line over 80 characters
Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amarjargal Gundjalam [Mon, 13 May 2013 10:23:55 +0000 (03:23 -0700)]
staging/crystalhd: Fixes line over 80 characters warning in crystalhd_hw.*
Fixes the following checkpatch warning
WARNING: line over 80 characters
Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amarjargal Gundjalam [Mon, 13 May 2013 10:18:07 +0000 (03:18 -0700)]
staging/crystalhd: Fixes line over 80 characters warning in crystalhd_misc.*
Fixes the following checkpatch warning
WARNING: line over 80 characters
Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amarjargal Gundjalam [Mon, 13 May 2013 03:43:09 +0000 (20:43 -0700)]
staging/crystalhd: Fixes line over 80 characters warning in crystalhd_lnx.*
Fixes the following checkpatch warning
WARNING: line over 80 characters
Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amarjargal Gundjalam [Mon, 13 May 2013 03:33:52 +0000 (20:33 -0700)]
staging/crystalhd: Fixes line over 80 characters warning in crystalhd_cmds.*
Fixes the following checkpatch warning
WARNING: line over 80 characters
Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Amarjargal Gundjalam [Mon, 13 May 2013 03:17:24 +0000 (20:17 -0700)]
staging/crystalhd: Fixes line over 80 characters warning in crystalhd_fw_if.h
Fixes the following checkpatch warning
WARNING: line over 80 characters
Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Mon, 13 May 2013 02:07:15 +0000 (05:07 +0300)]
wlan-ng: replace calls to kmalloc and memcpy with kmemdup
This patch replaces calls to kmalloc that are followed
by memcpy with calls to kmemdup.
This patch was found using coccicheck with api/memdup.cocci,
with memdup.cocci script slightly altered in the following way:
@depends on patch@
expression from,to,size,flag;
position p != {r1.p,r2.p};
@@
- to = \(kmalloc@p\|kzalloc@p\)(size,flag);
+ to = kmemdup(from,size,flag);
- memcpy(to, from, size);
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:54:50 +0000 (20:54 -0400)]
Staging:csr - Fixes whitespace around commas in unifi_sme.h.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:53:47 +0000 (20:53 -0400)]
Staging:csr - Fixes whitespace around commas in unifi_sme.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:51:34 +0000 (20:51 -0400)]
Staging:csr - Fixes whitespace around commas in unifi_priv.h.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:50:33 +0000 (20:50 -0400)]
Staging:csr - Fixes whitespace around commas in unifi_pdu_processing.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:47:45 +0000 (20:47 -0400)]
Staging:csr - Fixes whitespace around commas in unifi_event.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:46:48 +0000 (20:46 -0400)]
Staging:csr - Fixes whitespace around commas in ul_int.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:45:47 +0000 (20:45 -0400)]
Staging:csr - Fixes whitespace around commas in sme_wext.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:43:13 +0000 (20:43 -0400)]
Staging:csr - Fixes whitespace around commas in sme_sys.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:42:22 +0000 (20:42 -0400)]
Staging:csr - Fixes whitespace around commas in sme_userspace.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:40:56 +0000 (20:40 -0400)]
Staging:csr - Fixes whitespace around commas in sme_native.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:39:13 +0000 (20:39 -0400)]
Staging:csr - Fixes whitespace around commas in sme_blocking.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:37:53 +0000 (20:37 -0400)]
Staging:csr - Fixes whitespace around commas in sdio_mmc.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:36:47 +0000 (20:36 -0400)]
Staging:csr - Fixes whitespace around commas in netdev.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:35:24 +0000 (20:35 -0400)]
Staging:csr - Fixes whitespace around commas in io.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:34:05 +0000 (20:34 -0400)]
Staging:csr - Fixes whitespace around commas in drv.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Mon, 13 May 2013 00:32:20 +0000 (20:32 -0400)]
Staging:csr - Fixes whitespace around commas in csr_wifi_nme_ap_sef.c.
Fixes whitepace around commas. Caught by checkpatch.pl.
ERROR: space required after that ','
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tülin İzer [Sun, 12 May 2013 19:24:35 +0000 (22:24 +0300)]
Staging: bcm: Fixed warning about pointer position.
This patch fixes warning about pointer position in driver bcm.
Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Aida Mynzhasova [Mon, 6 May 2013 20:04:41 +0000 (00:04 +0400)]
staging:iio:adc: Use kstrtol()/kstrtoul()
Replace deprecated strict_strtol()/strict_strtoul() with
kstrtol()/kstrtoul(). Add missing checks for conversion return codes.
Signed-off-by: Aida Mynzhasova <ai.c.c0der@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lisa Nguyen [Mon, 6 May 2013 06:38:24 +0000 (23:38 -0700)]
staging: echo: Fixed camel-case variable names
Fixed camel-case variable names in echo.c and echo.h.
Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lisa Nguyen [Sun, 5 May 2013 23:28:37 +0000 (16:28 -0700)]
staging: usbip: Renaming pr_warning function
Eliminated the following warning "WARNING: Prefer pr_warn(... to
pr_warning(...)" by renaming the pr_warning function to pr_warn in
usbip_event.c file.
Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Katrina Prosise [Mon, 13 May 2013 00:17:41 +0000 (17:17 -0700)]
Staging: keucr: fixed CamelCase warning
This patch fixes the checkpatch warning of CamelCase ENE_Read_BYTE
Signed-off-by: Katrina Prosise <katrina.prosise@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sun, 12 May 2013 00:15:08 +0000 (03:15 +0300)]
STAGING: rtl8192u: fix checkpatch error by adding space after switch
This patch fixes the following checkpatch error:
ERROR: space required before the open parenthesis '('
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 23:08:30 +0000 (02:08 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in tl819x_TSProc.c
This patch fixes the pointer position in tl819x_TSProc.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 23:08:29 +0000 (02:08 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in rtl819x_Qos.h
This patch fixes the pointer position in rtl819x_Qos.h
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 23:08:28 +0000 (02:08 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in rtl819x_HTProc.c
This patch fixes the pointer position in rtl819x_HTProc.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 23:08:27 +0000 (02:08 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in rtl819x_BAProc.c
This patch fixes the pointer position in rtl819x_BAProc.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:50 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in dot11d
This patch fixes the pointer position in dot11d.h and dot11d.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:49 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in ieee80211_tx.c
This patch fixes the pointer position in ieee80211_tx.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:48 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in ieee80211_softmac.c
This patch fixes the pointer position in ieee80211_softmac.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:47 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in ieee80211_rx.c
This patch fixes the pointer position in ieee80211_rx.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:46 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in ieee80211_crypt_wep.c
This patch fixes the pointer position in ieee80211_crypt_wep.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:45 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in ieee80211_crypt_tkip.c
This patch fixes the pointer position in ieee80211_crypt_tkip.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:44 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in ieee80211_crypt_ccmp.c
This patch fixes the pointer position in ieee80211_crypt_ccmp.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:43 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee80211: fix checkpatch error about pointer position in ieee80211_crypt
This patch fixes the pointer position in ieee80211_crypt.h and
ieee80211_crypt.c to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 18:10:42 +0000 (21:10 +0300)]
STAGING: rtl8192u/ieee20811: fix checkpatch error about pointer position in ieee20811.h
This patch fixes the pointer position in ieee20811.h
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 14:22:25 +0000 (17:22 +0300)]
STAGING: rtl8192u: fix checkpatch error about pointer position in r8192U.h
This patch fixes the pointer position in r8192U.h
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 14:22:24 +0000 (17:22 +0300)]
STAGING: rtl8192u: fix checkpatch error about pointer position in r8192U_wx.c
This patch fixes the pointer position in r8192U_wx.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 14:22:23 +0000 (17:22 +0300)]
STAGING: rtl8192u: fix checkpatch error about pointer position in r8190_rtl8256
This patch fixes the pointer position in r8190_rtl8256.h and r8190_rtl8256.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 14:22:22 +0000 (17:22 +0300)]
STAGING: rtl8192u: fix checkpatch error about pointer position in r819xU_phy
This patch fixes the pointer position in r819xU_phy.h and r819xU_phy.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 14:22:21 +0000 (17:22 +0300)]
STAGING: rtl8192u: fix checkpatch error about pointer position in r819xU_firmware.c
This patch fixes the pointer position in r819xU_firmware.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Sat, 11 May 2013 14:22:20 +0000 (17:22 +0300)]
STAGING: rtl8192u: fix checkpatch error about pointer position in r819xU_cmdpkt
This patch fixes the pointer position in r819xU_cmdpkt.h and r819xU_cmdpkt.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tülin İzer [Sat, 11 May 2013 02:00:33 +0000 (05:00 +0300)]
staging: dgrp: Fixed warning 'space prohibited before semicolon'
This patch fixes warning 'space prohibited before semicolon' in driver
dgrp.
Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tülin İzer [Sat, 11 May 2013 12:26:09 +0000 (15:26 +0300)]
Staging: bcm: fixed warning 'space reqires around '==' '
This patch fixes warning found by checkpatch.pl in driver bcm.
Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tülin İzer [Sat, 11 May 2013 12:25:34 +0000 (15:25 +0300)]
Staging: bcm: fixed warning 'space required after ',' '
This patch fixes warning found by checkpatch.pl in driver bcm.
Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Severin Gsponer [Mon, 29 Apr 2013 13:49:04 +0000 (15:49 +0200)]
Staging: bcm: Fix of a litte white space error in Bcmchar.c
Fixed a wrong placed whitespace. Found with the checkpatch.pl script.
checkpatch.pl error message:
ERROR: "foo * bar" should be "foo *bar"
+static int bcm_char_open(struct inode *inode, struct file * filp)
Signed-off-by: Severin Gsponer <svgsponer@gmail.com>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Elena Ufimtseva [Fri, 10 May 2013 21:04:26 +0000 (17:04 -0400)]
staging:
ced1401: Fixes checkpatch warnings about pointer format
Fixes checkpatch warnings about pointer format.
Signed-off-by: Elena Ufimtseva <ufimtseva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Marlies Ruck [Fri, 10 May 2013 20:26:30 +0000 (16:26 -0400)]
staging: android: Fixed line over 80 char
Fixes the following checkpatch warning:
Warning: Line over 80 characters
Signed-off-by: Marlies Ruck <marlies.ruck@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lidza Louina [Fri, 10 May 2013 15:05:37 +0000 (11:05 -0400)]
staging: sb105x: Fixes pointer format in sb_pci_mp.c
Fixes checkpatch warning about pointer format.
Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hema Prathaban [Thu, 9 May 2013 13:38:51 +0000 (19:08 +0530)]
staging: goldfish: Fixed line over 80 characters
Fixes the following checkpatch warning:
WARNING: line over 80 characters
Signed-off-by: Hema Prathaban <hemaklnce@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hema Prathaban [Thu, 9 May 2013 13:37:28 +0000 (19:07 +0530)]
staging: goldfish: Fixed Trailing Whitespace
Fixes the following checkpatch Error:
Error: trailing whitespace
Signed-off-by: Hema Prathaban <hemaklnce@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Wed, 8 May 2013 22:48:52 +0000 (01:48 +0300)]
STAGING: rtl8192u: fix checkpatch error about pointer position in r8192U_dm.c
This patch fixes the pointer position in r8192U_dm.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Xenia Ragiadakou [Wed, 8 May 2013 22:08:25 +0000 (01:08 +0300)]
STAGING: rtl8192u: fix checkpatch error about pointer position in r8192U_core.c
This patch fixes the pointer position in r8192U_core.c
to meet the kernel coding style conventions.
Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hema Prathaban [Wed, 8 May 2013 18:59:34 +0000 (00:29 +0530)]
staging: android: Replace seq_printf with seq_puts
Fixes the following checkpatch warning:
WARNING: Prefer seq_puts to seq_printf
Signed-off-by: Hema Prathaban <hemaklnce@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Hema Prathaban [Wed, 8 May 2013 18:57:09 +0000 (00:27 +0530)]
staging: android: Remove unnecessary braces
Fixes the following checkpatch warning:
WARNING: braces {} are not necessary for single statement blocks
Signed-off-by: Hema Prathaban <hemaklnce@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Lisa Nguyen [Mon, 6 May 2013 20:04:30 +0000 (13:04 -0700)]
vme/devices: Fixed camel-case variable names
Fixed camel-case variable names in vme_user.c and vme_user.h.
Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tülin İzer [Sun, 12 May 2013 12:57:11 +0000 (15:57 +0300)]
Staging: asus_oled: fixed warning 'default case should have 'break'.
This patch fixes the warning about switch case found by checkpatch.pl
in driver asus_oled.
Signed-off-by: Tülin İzer <tulinizer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linus Torvalds [Sun, 12 May 2013 00:14:08 +0000 (17:14 -0700)]
Linux 3.10-rc1
Linus Torvalds [Sun, 12 May 2013 00:04:59 +0000 (17:04 -0700)]
Merge tag 'trace-fixes-v3.10' of git://git./linux/kernel/git/rostedt/linux-trace
Pull tracing/kprobes update from Steven Rostedt:
"The majority of these changes are from Masami Hiramatsu bringing
kprobes up to par with the latest changes to ftrace (multi buffering
and the new function probes).
He also discovered and fixed some bugs in doing so. When pulling in
his patches, I also found a few minor bugs as well and fixed them.
This also includes a compile fix for some archs that select the ring
buffer but not tracing.
I based this off of the last patch you took from me that fixed the
merge conflict error, as that was the commit that had all the changes
I needed for this set of changes."
* tag 'trace-fixes-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/kprobes: Support soft-mode disabling
tracing/kprobes: Support ftrace_event_file base multibuffer
tracing/kprobes: Pass trace_probe directly from dispatcher
tracing/kprobes: Increment probe hit-count even if it is used by perf
tracing/kprobes: Use bool for retprobe checker
ftrace: Fix function probe when more than one probe is added
ftrace: Fix the output of enabled_functions debug file
ftrace: Fix locking in register_ftrace_function_probe()
tracing: Add helper function trace_create_new_event() to remove duplicate code
tracing: Modify soft-mode only if there's no other referrer
tracing: Indicate enabled soft-mode in enable file
tracing/kprobes: Fix to increment return event probe hit-count
ftrace: Cleanup regex_lock and ftrace_lock around hash updating
ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
ftrace: Have ftrace_regex_write() return either read or error
tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()
tracing: Don't succeed if event_enable_func did not register anything
ring-buffer: Select IRQ_WORK
Linus Torvalds [Sat, 11 May 2013 23:19:30 +0000 (16:19 -0700)]
Merge tag 'stable/for-linus-3.10-rc0-tag-two' of git://git./linux/kernel/git/konrad/xen
Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
- More fixes in the vCPU PVHVM hotplug path.
- Add more documentation.
- Fix various ARM related issues in the Xen generic drivers.
- Updates in the xen-pciback driver per Bjorn's updates.
- Mask the x2APIC feature for PV guests.
* tag 'stable/for-linus-3.10-rc0-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/pci: Used cached MSI-X capability offset
xen/pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
xen: clear IRQ_NOAUTOEN and IRQ_NOREQUEST
xen: mask x2APIC feature in PV
xen: SWIOTLB is only used on x86
xen/spinlock: Fix check from greater than to be also be greater or equal to.
xen/smp/pvhvm: Don't point per_cpu(xen_vpcu, 33 and larger) to shared_info
xen/vcpu: Document the xen_vcpu_info and xen_vcpu
xen/vcpu/pvhvm: Fix vcpu hotplugging hanging.
Linus Torvalds [Sat, 11 May 2013 22:24:22 +0000 (15:24 -0700)]
Merge tag 'scsi-for-linus' of git://git./linux/kernel/git/jejb/scsi
Pull second SCSI update from James "Jaj B" Bottomley:
"This is the final round of SCSI patches for the merge window. It
consists mostly of driver updates (bnx2fc, ibmfc, fnic, lpfc,
be2iscsi, pm80xx, qla4x and ipr).
There's also the power management updates that complete the patches in
Jens' tree, an iscsi refcounting problem fix from the last pull, some
dif handling in scsi_debug fixes, a few nice code cleanups and an
error handling busy bug fix."
* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (92 commits)
[SCSI] qla2xxx: Update firmware link in Kconfig file.
[SCSI] iscsi class, qla4xxx: fix sess/conn refcounting when find fns are used
[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
[SCSI] pm80xx: thermal, sas controller config and error handling update
[SCSI] pm80xx: NCQ error handling changes
[SCSI] pm80xx: WWN Modification for PM8081/88/89 controllers
[SCSI] pm80xx: Changed module name and debug messages update
[SCSI] pm80xx: Firmware flash memory free fix, with addition of new memory region for it
[SCSI] pm80xx: SPC new firmware changes for device id 0x8081 alone
[SCSI] pm80xx: Added SPCv/ve specific hardware functionalities and relevant changes in common files
[SCSI] pm80xx: MSI-X implementation for using 64 interrupts
[SCSI] pm80xx: Updated common functions common for SPC and SPCv/ve
[SCSI] pm80xx: Multiple inbound/outbound queue configuration
[SCSI] pm80xx: Added SPCv/ve specific ids, variables and modify for SPC
[SCSI] lpfc: fix up Kconfig dependencies
[SCSI] Handle MLQUEUE busy response in scsi_send_eh_cmnd
[SCSI] sd: change to auto suspend mode
[SCSI] sd: use REQ_PM in sd's runtime suspend operation
[SCSI] qla4xxx: Fix iocb_cnt calculation in qla4xxx_send_mbox_iocb()
[SCSI] ufs: Correct the expected data transfersize
...
Linus Torvalds [Sat, 11 May 2013 22:23:17 +0000 (15:23 -0700)]
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux
Pull idle update from Len Brown:
"Add support for new Haswell-ULT CPU idle power states"
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
intel_idle: initial C8, C9, C10 support
tools/power turbostat: display C8, C9, C10 residency
Linus Torvalds [Sat, 11 May 2013 21:29:11 +0000 (14:29 -0700)]
Merge git://git.infradead.org/users/eparis/audit
Pull audit changes from Eric Paris:
"Al used to send pull requests every couple of years but he told me to
just start pushing them to you directly.
Our touching outside of core audit code is pretty straight forward. A
couple of interface changes which hit net/. A simple argument bug
calling audit functions in namei.c and the removal of some assembly
branch prediction code on ppc"
* git://git.infradead.org/users/eparis/audit: (31 commits)
audit: fix message spacing printing auid
Revert "audit: move kaudit thread start from auditd registration to kaudit init"
audit: vfs: fix audit_inode call in O_CREAT case of do_last
audit: Make testing for a valid loginuid explicit.
audit: fix event coverage of AUDIT_ANOM_LINK
audit: use spin_lock in audit_receive_msg to process tty logging
audit: do not needlessly take a lock in tty_audit_exit
audit: do not needlessly take a spinlock in copy_signal
audit: add an option to control logging of passwords with pam_tty_audit
audit: use spin_lock_irqsave/restore in audit tty code
helper for some session id stuff
audit: use a consistent audit helper to log lsm information
audit: push loginuid and sessionid processing down
audit: stop pushing loginid, uid, sessionid as arguments
audit: remove the old depricated kernel interface
audit: make validity checking generic
audit: allow checking the type of audit message in the user filter
audit: fix build break when AUDIT_DEBUG == 2
audit: remove duplicate export of audit_enabled
Audit: do not print error when LSMs disabled
...
Linus Torvalds [Fri, 10 May 2013 16:28:55 +0000 (09:28 -0700)]
Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux
Pull nfsd fixes from Bruce Fields:
"Small fixes for two bugs and two warnings"
* 'for-3.10' of git://linux-nfs.org/~bfields/linux:
nfsd: fix oops when legacy_recdir_name_error is passed a -ENOENT error
SUNRPC: fix decoding of optional gss-proxy xdr fields
SUNRPC: Refactor gssx_dec_option_array() to kill uninitialized warning
nfsd4: don't allow owner override on 4.1 CLAIM_FH opens
Linus Torvalds [Fri, 10 May 2013 16:27:40 +0000 (09:27 -0700)]
Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86
Pull x86 platform drivers from Matthew Garrett:
"Small set of updates, mainly trivial bugfixes and some small updates
to deal with newer hardware.
There's also a new driver that allows qemu guests to notify the
hypervisor that they've just paniced, which seems useful."
* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86:
Add support for fan button on Ideapad Z580
pvpanic: pvpanic device driver
asus-nb-wmi: set wapf=4 for ASUSTeK COMPUTER INC. X75A
drivers: platform: x86: Use PTR_RET function
sony-laptop: SVS151290S kbd backlight and gfx switch support
hp-wmi: add more definitions for new event_id's
dell-laptop: Fix krealloc() misuse in parse_da_table()
hp_accel: Ignore the error from lis3lv02d_poweron() at resume
dell: add new dell WMI format for the AIO machines
Linus Torvalds [Fri, 10 May 2013 16:21:05 +0000 (09:21 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/signal
Pull stray syscall bits from Al Viro:
"Several syscall-related commits that were missing from the original"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
switch compat_sys_sysctl to COMPAT_SYSCALL_DEFINE
unicore32: just use mmap_pgoff()...
unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE
x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)