Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) Update broken web addresses in arch directory. Update broken web addresses in the kernel. Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget Revert "Fix typo: configuation => configuration" partially ida: document IDA_BITMAP_LONGS calculation ext2: fix a typo on comment in ext2/inode.c drivers/scsi: Remove unnecessary casts of private_data drivers/s390: Remove unnecessary casts of private_data net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data drivers/infiniband: Remove unnecessary casts of private_data drivers/gpu/drm: Remove unnecessary casts of private_data kernel/pm_qos_params.c: Remove unnecessary casts of private_data fs/ecryptfs: Remove unnecessary casts of private_data fs/seq_file.c: Remove unnecessary casts of private_data arm: uengine.c: remove C99 comments arm: scoop.c: remove C99 comments Fix typo configue => configure in comments Fix typo: configuation => configuration Fix typo interrest[ing|ed] => interest[ing|ed] Fix various typos of valid in comments ... Fix up trivial conflicts in: drivers/char/ipmi/ipmi_si_intf.c drivers/usb/gadget/rndis.c net/irda/irnet/irnet_ppp.c
这个提交包含在:
13
lib/idr.c
13
lib/idr.c
@@ -284,7 +284,7 @@ static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id)
|
||||
* idr_get_new_above - allocate new idr entry above or equal to a start id
|
||||
* @idp: idr handle
|
||||
* @ptr: pointer you want associated with the id
|
||||
* @start_id: id to start search at
|
||||
* @starting_id: id to start search at
|
||||
* @id: pointer to the allocated handle
|
||||
*
|
||||
* This is the allocate id function. It should be called with any
|
||||
@@ -479,7 +479,7 @@ EXPORT_SYMBOL(idr_remove_all);
|
||||
|
||||
/**
|
||||
* idr_destroy - release all cached layers within an idr tree
|
||||
* idp: idr handle
|
||||
* @idp: idr handle
|
||||
*/
|
||||
void idr_destroy(struct idr *idp)
|
||||
{
|
||||
@@ -586,10 +586,11 @@ EXPORT_SYMBOL(idr_for_each);
|
||||
/**
|
||||
* idr_get_next - lookup next object of id to given id.
|
||||
* @idp: idr handle
|
||||
* @id: pointer to lookup key
|
||||
* @nextidp: pointer to lookup key
|
||||
*
|
||||
* Returns pointer to registered object with id, which is next number to
|
||||
* given id.
|
||||
* given id. After being looked up, *@nextidp will be updated for the next
|
||||
* iteration.
|
||||
*/
|
||||
|
||||
void *idr_get_next(struct idr *idp, int *nextidp)
|
||||
@@ -758,7 +759,7 @@ EXPORT_SYMBOL(ida_pre_get);
|
||||
/**
|
||||
* ida_get_new_above - allocate new ID above or equal to a start id
|
||||
* @ida: ida handle
|
||||
* @staring_id: id to start search at
|
||||
* @starting_id: id to start search at
|
||||
* @p_id: pointer to the allocated handle
|
||||
*
|
||||
* Allocate new ID above or equal to @ida. It should be called with
|
||||
@@ -912,7 +913,7 @@ EXPORT_SYMBOL(ida_remove);
|
||||
|
||||
/**
|
||||
* ida_destroy - release all cached layers within an ida tree
|
||||
* ida: ida handle
|
||||
* @ida: ida handle
|
||||
*/
|
||||
void ida_destroy(struct ida *ida)
|
||||
{
|
||||
|
在新工单中引用
屏蔽一个用户