summaryrefslogtreecommitdiff
path: root/drivers/staging/rtl8192e
AgeCommit message (Collapse)Author
2015-02-07Staging: rtl8192e: Fixed unnecessary line continuation.Kolbeinn Karlsson
Fixed a coding style issue. Signed-off-by: Kolbeinn Karlsson <kolbeinnkarls@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: Fix duplicated conditional branchAlexander Kuleshov
Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: fixed a space coding style issueGangadhar Vukkesala
Fixed a space coding style issue in 3-dimensional array initialization which was found when running checkpatch.pl script on rtl819x_HTProc.c. Signed-off-by: Gangadhar Vukkesala <gangs.freelancer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: rtllib_rx.c: Remove some unused functionsRickard Strandqvist
Removes some functions that are not used anywhere: update_ibss_network() rtllib_SignalStrengthTranslate() This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: rtl8192e: rtl_pm.c: Remove some unused functionsRickard Strandqvist
Removes some functions that are not used anywhere: rtl8192E_save_state() rtl8192E_enable_wake() This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: rtl8192e: rtl_cam.c: Remove unused functionRickard Strandqvist
Remove the function CAM_read_entry() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-01-17staging: rtl8192e: rejoin split quoted stringsJonathan Jin
Fix a checkpatch.pl warning regarding quoted string splits across lines. While each join of these quoted strings results in a new checkpatch.pl "lines over 80 characters" warning, the regained ability to grep for these log strings in the codebase is, I would argue, well worth the trade-off. Signed-off-by: Jonathan Jin <jjin082693@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-12-03drivers: staging: rtl8192e: Include "asm/unaligned.h" instead of ↵Chen Gang
"access_ok.h" in "rtl819x_BAProc.c" "asm/unaligned.h" is more generic than "access_ok.h", and it may include "access_ok.h", so need use it instead of "access_ok.h". During building, "rtllib.h" has already include "asm/unaligned.h", so will cause building issue. The related error (with allmodconfig under parisc): CC [M] drivers/staging/rtl8192e/rtl819x_BAProc.o In file included from ./arch/parisc/include/asm/unaligned.h:4:0, from include/linux/ieee80211.h:22, from include/net/lib80211.h:31, from drivers/staging/rtl8192e/rtllib.h:45, from drivers/staging/rtl8192e/rtl819x_BAProc.c:20: include/linux/unaligned/be_struct.h:6:19: error: redefinition of 'get_unaligned_be16' static inline u16 get_unaligned_be16(const void *p) ^ In file included from drivers/staging/rtl8192e/rtl819x_BAProc.c:19:0: include/linux/unaligned/access_ok.h:22:19: note: previous definition of 'get_unaligned_be16' was here static inline u16 get_unaligned_be16(const void *p) ^ ... For independent from other include files, still suggest it includes "asm/unaligned.h" too. And also include "asm/byteorder.h" since it is the first include file". Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-12-03Drivers:staging:rtl8192e: Fixed checkpatch warningAthira Lekshmi
Fixed checkpatch warning: WARNING: space prohibited before semicolon Signed-off-by: Athira Lekshmi <andnlnbn18@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-11-26staging: rtl8192e: add missing tasklet_kill on remove pathDevendra Naga
The powersave tasklet is created in rtllib_softmac_init and it is not removed while unloading the module. Cc: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-11-04Staging: rtl8192e: Use put_unaligned_le16Vaishali Thakkar
This patch introduces the use of function put_unaligned_le16. This is done using Coccinelle and semantic patch used is as follows: @@ identifier tmp; expression ptr; expression y,e; type T; @@ - tmp = cpu_to_le16(y); <+... when != tmp - memcpy(ptr, (T)&tmp, ...); + put_unaligned_le16(y,ptr); ...+> ? tmp = e @@ type T; identifier tmp; @@ - T tmp; ...when != tmp Here, to be compatible with the change header file is added too. Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-29staging, rtl8192e, LLVMLinux: Make static local in inline function constBehan Webster
rtllib_association_req is a (large) inline function which defines 2 constant static arrays which aren't labelled as const. As a result clang complains with: non-constant static local variable in inline function may be different in different files [-Wstatic-local-in-inline] static u8 AironetIeOui[] = {0x00, 0x01, 0x66}; ^ The solution is making them "static const". However doing so requires dropping const when being used with struct octet_string. However the value is used in a const fashion thereafter, so no harm done. Signed-off-by: Behan Webster <behanw@converseincode.com> Suggested-by: Arnd Bergmann <arnd@arndb.de> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-29staging, rtl8192e, LLVMLinux: Remove unused prototypeBehan Webster
MgntQuery_MgntFrameTxRate is only used within rtllib_softmac.c, so it really should be static instead of extern. Since it is currently extern a warning is generated because a different function of the same name is defined staticlly in ieee80211_softmac.c Removing the incorrect extern declaration and defining the rtllib_softmac version of this routine static fixes the warning. Signed-off-by: Behan Webster <behanw@converseincode.com> Suggested-by: Arnd Bergmann <arnd@arndb.de> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-29staging, rtl8192e, LLVMLinux: Remove unused inline prototypeBehan Webster
rtllib_probe_req is defined as "static inline" in rtllib_softmac.c however it is declared differently as "extern inline" in rtllib_softmac.h. Since it isn't used outside of the scope of rtllib_softmac, it makes sense to remove the incorrect declaration. Signed-off-by: Behan Webster <behanw@converseincode.com> Suggested-by: Arnd Bergmann <arnd@arndb.de> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-29staging, rtl8192e, LLVMLinux: Change extern inline to static inlineBehan Webster
With compilers which follow the C99 standard (like modern versions of gcc and clang), "extern inline" does the opposite thing from older versions of gcc (emits code for an externally linkable version of the inline function). "static inline" does the intended behavior in all cases instead. Signed-off-by: Behan Webster <behanw@converseincode.com> Suggested-by: Arnd Bergmann <arnd@arndb.de> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-29Staging: rtl8192e: Change variable type from u16 to __le16Vaishali Thakkar
This patch changes declaration of variable tmp from u16 to __le16 in order to remove following sparse warning at number of places: warning: incorrect type in assignment (different base types) expected unsigned short [unsigned] [usertype] tmp got restricted __le16 [usertype] <noident> Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-29Staging: rtl8192e: Revert one previous commitVaishali Thakkar
This patch reverts commit 450246465a76 ("Staging: rtl8192e: Fix incorrect type in assignment in rtl819x_BAProc.c") as it is changing code and introducing bug to skip the endian conversion. Here, tmp variable is used to hold the endian-corrected values and network-data requires fixed endianness. Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-28staging: rtl8192e: delete successive assignments to the same locationJiayi Ye
Successive assignments to the same location is meaningless and can be deleted. The Coccinelle semantic patch was used to find cases. @@ expression e1,e2,e3; @@ ( (<+...e1++...+>)=e2; | (<+...e1--...+>)=e2; | (<+...++e1...+>)=e2; | (<+...--e1...+>)=e2; | e1=e2; e1 = <+...e1...+>; | *e1=e2; *e1=e3; ) Signed-off-by: Jiayi Ye <yejiayily@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-27staging: rtl8192e: Remove unnecessary codeTapasweni Pathak
kfree on NULL pointer is a no-op. This used the following semantic patch to identify such a instance // <smpl> @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // </smpl> As rxb is always null at this point, so the code to kfree it and intializing it to NULL is removed completely. Suggested by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-20staging: rtl8192e: Fix pointer type declaration style errorsJohn Ledbetter
This fixes the following checkpatch.pl errors: drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:1290 error: "foo* bar" should be "foo *bar" drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c:1305 error: "foo * bar" should be "foo *bar" Signed-off-by: John Ledbetter <john@throttle.io> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-14staging: rtl8192e: use %*pEn to escape bufferAndy Shevchenko
Let's use kernel's native specifier to escape a buffer. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: "John W . Linville" <linville@tuxdriver.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-10-02staging: rtl8192e: rtl8192e: Remove spaces before the semicolonsFeyza Yavuz
Patch the following checkpatch.pl warnings drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c:232: warning: space prohibited before semicolon drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c:236: warning: space prohibited before semicolon Signed-off-by: Feyza Yavuz <feyzaayavuz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: rtl8192e: rtl8192e: Remove unnecessary return statementsFeyza Yavuz
Patch the following checkpatch.pl warnings drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c:304: warning: void function return statements are not generally useful drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c:83: warning: void function return statements are not generally useful Signed-off-by: Feyza Yavuz <feyzaayavuz@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: rtl8192e: Remove unneeded void returnMelike Yurtoglu
Fixes "void function return statements are not generally useful"checkpatch.pl warning Signed-off-by: Melike Yurtoglu <aysemelikeyurtoglu@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: rtl8192e: Fix void function return statements styleMelike Yurtoglu
Fixes "void function return statements are not generally useful"checkpatch.pl warning in rtl819x_HTProc.c Signed-off-by: Melike Yurtoglu <aysemelikeyurtoglu@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: rtl8192e: Fix unnecessary space before function pointer argumentsMelike Yurtoglu
This patch fixes these warning messages found by checkpatch.pl: WARNING: Unnecessary space before function pointer arguments Signed-off-by: Melike Yurtoglu <aysemelikeyurtoglu@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-02staging: rtl8192e: Array was made static const char * constMelike Yurtoglu
This patch fixes checkpatch.pl error in file rtllib.h WARNING: static const char * array should probably be static const char * const Signed-off-by: Melike Yurtoglu <aysemelikeyurtoglu@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-29Staging: rtl8192e: Remove unused variableMahati Chamarthy
This patch removes a variable which has never been used. The following Coccinelle semantic patch was used to make this transformation: @@ type T; identifier i; constant C; @@ - T i; <... when != i - i = C; ...> Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-29Staging: rtl8192e: rtl8192e: Remove assigned unused variableMahati Chamarthy
This patch removes an initialized variable which has never been used. The following Coccinelle semantic patch was used to make this transformation: @e@ identifier i; position p; type T; @@ extern T i@p; @@ type T; identifier i; constant C; position p != e.p; @@ - T i@p; <+... when != i - i = C; ...+> The braces around if and else which become unnecessary after the transformation were also removed. Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-24Staging: rtl8192e: rtl8192e: Merge two lines and remove unused variableMahati Chamarthy
This patch merges an assignment with an immediately following return of the assigned variable. It also removes variables that became unused due to this transformation. The following Coccinelle semantic patch was used to make this transformation: @r@ identifier ret; identifier f; @@ -ret = +return f(...); -return ret; @@ identifier r.ret; expression e1; type t; @@ ( -t ret = e1; | -t ret; ) ... when != ret when strict Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-23Staging: rtl8192e: Fix else is not useful warning styleMahati Chamarthy
This fixes the following checkpatch.pl warnings: WARNING: else is not generally useful after a break or return Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-23Staging: rtl8192e: rtl8192e: Merges two lines of code and removes unused ↵Mahati Chamarthy
variable This patch merges an assignment with an immediately following return of the assigned variable. It also removes a variable that becomes unused due to this transformation. The following Coccinelle semantic patch was used to make this transformation: @@ expression ret; identifier f; @@ -ret = +return f(...); -return ret; @@ identifier ret; type t; identifier c; @@ -t ret = c; ... when != ret when strict Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix __constant_htons to htons style warningMahati Chamarthy
This fixes the following checkpatch.pl warning: WARNING: __constant_htons should be htons Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix printk debug style warningMahati Chamarthy
This fixes the following checkpatch.pl warnings: WARNING: Prefer [subsystem eg: netdev]_dbg([subsystem]dev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ... Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix printk style warningMahati Chamarthy
This fixes the following checkpatch.pl warnings: WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ... Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix space before semicolon warningMahati Chamarthy
This fixes the following checkpatch.pl warning: WARNING: space prohibited before semicolon Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix else is not useful warningMahati Chamarthy
This fixes the following checkpatch.pl warning: WARNING: else is not generally useful after a break or return Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix void function return statements style warningMahati Chamarthy
This fixes the following checkpatch.pl warnings: WARNING: void function return statements are not generally useful Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix else is not useful style warningMahati Chamarthy
This fixes the following checkpatch.pl warnings: WARNING: else is not generally useful after a break or return Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fixed style warning relating to printk()Vaishali Thakkar
This patch fixes following checkpatch.pl warning in file rtl_dm.c: WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO . Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix unnecessary parentheses style warningMahati Chamarthy
This fixes the following checkpatch.pl warning: WARNING: Unnecessary parentheses - maybe == should be = ? Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: Fix style warnings relating to printk(KERN_DEBUGMahati Chamarthy
This fixes the following checkpatch.pl warnings: WARNING: Prefer [subsystem eg: netdev]_dbg([subsystem]dev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ... Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: rtl8192e: Remove unnecessory braces and spaceVaishali Thakkar
This patch removes following checkpatch.pl warnings in rtl_core.c file: WARNING: Braces {} are not necessary for single statement blocks WARNING: Space prohibited before semicolon Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-09-20Staging: rtl8192e: rtl8192e: Remove unnecessory variableVaishali Thakkar
This patch removes unnecessory variable in file ret_core.c using coccinelle script.Semantic patch for this is as follows: @@ identifier ret; @@ -int ret = 0; ... when != ret when strict -return ret; +return 0; Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-08-30staging: rtl8192e: fixed coding style issuesMatthew Casey
Fixed missing blank line after declarations issues Signed-off-by: Matthew Casey <mdcasey@chabloom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-08-08staging: use pci_zalloc_consistentJoe Perches
Remove the now unnecessary memset too. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Lior Dotan <liodot@gmail.com> Cc: Christopher Harrer <charrer@alacritech.com> Cc: Forest Bond <forest@alittletooquiet.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-07-09Staging: rtl8192e: Fix potential NULL pointer dereferenceEmil Goode
We need to make sure the struct rtllib_device pointer ieee is not NULL after the goto rx_dropped label since it is dereferenced there. Signed-off-by: Emil Goode <emilgoode@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-26Staging: rtl8192e: adjust error handlingHimangi Saraogi
This patch removes a test in error handling code by adding a return path. The Coccinelle semantic match that found the problem is: // <smpl> @@ expression E,E1,E2; @@ E = alloc_etherdev(...) ... when != E = E1 if (...) { ... free_netdev(E); ... return ...; } ... when != E = E2 ( if (...) { ... when != free_netdev(E); return dev; } | * if (...) { ... when != free_netdev(E); return ...; } | register_netdev(E) ) // </smpl> Signed-off-by: Himangi Saraogi <himangi774@gmail.com> Acked-by: Julia Lawall <julia.lawall@lip6.fr> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-20Staging: rtl8192e: dot11d: Fixed printk coding style issuesA Raghavendra Rao
Replaced 'printk' with 'netdev_' function Signed-off-by: A Raghavendra Rao <arrao@cdac.in> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-08Merge branch 'next' (accumulated 3.16 merge window patches) into masterLinus Torvalds
Now that 3.15 is released, this merges the 'next' branch into 'master', bringing us to the normal situation where my 'master' branch is the merge window. * accumulated work in next: (6809 commits) ufs: sb mutex merge + mutex_destroy powerpc: update comments for generic idle conversion cris: update comments for generic idle conversion idle: remove cpu_idle() forward declarations nbd: zero from and len fields in NBD_CMD_DISCONNECT. mm: convert some level-less printks to pr_* MAINTAINERS: adi-buildroot-devel is moderated MAINTAINERS: add linux-api for review of API/ABI changes mm/kmemleak-test.c: use pr_fmt for logging fs/dlm/debug_fs.c: replace seq_printf by seq_puts fs/dlm/lockspace.c: convert simple_str to kstr fs/dlm/config.c: convert simple_str to kstr mm: mark remap_file_pages() syscall as deprecated mm: memcontrol: remove unnecessary memcg argument from soft limit functions mm: memcontrol: clean up memcg zoneinfo lookup mm/memblock.c: call kmemleak directly from memblock_(alloc|free) mm/mempool.c: update the kmemleak stack trace for mempool allocations lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations mm: introduce kmemleak_update_trace() mm/kmemleak.c: use %u to print ->checksum ...
generated by cgit v0.10.2 at 2024-07-10 12:15:04 (GMT)