You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree update from Jiri Kosina: "Usual stuff: documentation updates, printk() fixes, etc" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits) intel_ips: fix a type in error message cpufreq: cpufreq-dt: Move newline to end of error message ps3rom: fix error return code treewide: fix typo in printk and Kconfig ARM: dts: bcm63138: change "interupts" to "interrupts" Replace mentions of "list_struct" to "list_head" kernel: trace: fix printk message scsi: mpt2sas: fix ioctl in comment zbud, zswap: change module author email clocksource: Fix 'clcoksource' typo in comment arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help gpio: msm-v1: make boolean argument more obvious usb: Fix typo in usb-serial-simple.c PCI: Fix comment typo 'COMFIG_PM_OPS' powerpc: Fix comment typo 'CONIFG_8xx' powerpc: Fix comment typos 'CONFiG_ALTIVEC' clk: st: Spelling s/stucture/structure/ isci: Spelling s/stucture/structure/ usb: gadget: zero: Spelling s/infrastucture/infrastructure/ treewide: Fix company name in module descriptions ...
This commit is contained in:
@@ -11,7 +11,7 @@ Please find an example below:
|
||||
|
||||
Clockgen block diagram
|
||||
-------------------------------------------------------------------
|
||||
| Flexgen stucture |
|
||||
| Flexgen structure |
|
||||
| --------------------------------------------- |
|
||||
| | ------- -------- -------- | |
|
||||
clk_sysin | | | | | | | | |
|
||||
|
||||
@@ -172,7 +172,7 @@ ways.
|
||||
|
||||
- eh_strategy_handler() callback
|
||||
This is one big callback which should perform whole error
|
||||
handling. As such, it should do all choirs SCSI midlayer
|
||||
handling. As such, it should do all chores the SCSI midlayer
|
||||
performs during recovery. This will be discussed in [2-2].
|
||||
|
||||
Once recovery is complete, SCSI EH resumes normal operation by
|
||||
@@ -428,7 +428,7 @@ scmd->allowed.
|
||||
scsi_unjam_host() and it is responsible for whole recovery process.
|
||||
On completion, the handler should have made lower layers forget about
|
||||
all failed scmds and either ready for new commands or offline. Also,
|
||||
it should perform SCSI EH maintenance choirs to maintain integrity of
|
||||
it should perform SCSI EH maintenance chores to maintain integrity of
|
||||
SCSI midlayer. IOW, of the steps described in [2-1-2], all steps
|
||||
except for #1 must be implemented by eh_strategy_handler().
|
||||
|
||||
|
||||
@@ -376,7 +376,7 @@ functions and binds them. This way the whole gadget is bound.
|
||||
configured, so config_groups for particular functions are defined
|
||||
in the functions implementation files drivers/usb/gadget/f_*.c.
|
||||
|
||||
5. Funciton's code is written in such a way that it uses
|
||||
5. Function's code is written in such a way that it uses
|
||||
|
||||
usb_get_function_instance(), which, in turn, calls request_module.
|
||||
So, provided that modprobe works, modules for particular functions
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
twd_watchdog: watchdog@1e620 {
|
||||
compatible = "arm,cortex-a9-twd-wdt";
|
||||
reg = <0x1e620 0x20>;
|
||||
interupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ config ARCH_EXYNOS3
|
||||
bool "SAMSUNG EXYNOS3"
|
||||
select ARM_CPU_SUSPEND if PM
|
||||
help
|
||||
Samsung EXYNOS3 (Crotex-A7) SoC based systems
|
||||
Samsung EXYNOS3 (Cortex-A7) SoC based systems
|
||||
|
||||
config ARCH_EXYNOS4
|
||||
bool "SAMSUNG EXYNOS4"
|
||||
|
||||
@@ -1092,7 +1092,7 @@ static int __init edac_devinit(void)
|
||||
name = edac_device_names[i];
|
||||
dev = platform_device_register_simple(name, -1, NULL, 0);
|
||||
if (IS_ERR(dev)) {
|
||||
pr_err("Registation of %s failed!\n", name);
|
||||
pr_err("Registration of %s failed!\n", name);
|
||||
err = PTR_ERR(dev);
|
||||
}
|
||||
}
|
||||
@@ -1103,7 +1103,7 @@ static int __init edac_devinit(void)
|
||||
dev = platform_device_register_simple("octeon_lmc_edac",
|
||||
i, NULL, 0);
|
||||
if (IS_ERR(dev)) {
|
||||
pr_err("Registation of octeon_lmc_edac %d failed!\n", i);
|
||||
pr_err("Registration of octeon_lmc_edac %d failed!\n", i);
|
||||
err = PTR_ERR(dev);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -708,7 +708,7 @@ static int __init octeon_pci_setup(void)
|
||||
|
||||
if (IS_ERR(platform_device_register_simple("octeon_pci_edac",
|
||||
-1, NULL, 0)))
|
||||
pr_err("Registation of co_pci_edac failed!\n");
|
||||
pr_err("Registration of co_pci_edac failed!\n");
|
||||
|
||||
octeon_pci_dma_init();
|
||||
|
||||
|
||||
@@ -661,7 +661,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
|
||||
if (unlikely((pr && !(mas3 & MAS3_UX)) ||
|
||||
(!pr && !(mas3 & MAS3_SX)))) {
|
||||
pr_err_ratelimited(
|
||||
"%s: Instuction emulation from guest addres %08lx without execute permission\n",
|
||||
"%s: Instruction emulation from guest address %08lx without execute permission\n",
|
||||
__func__, geaddr);
|
||||
return EMULATE_AGAIN;
|
||||
}
|
||||
@@ -673,7 +673,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
|
||||
if (has_feature(vcpu, VCPU_FTR_MMU_V2) &&
|
||||
unlikely((mas2 & MAS2_I) || (mas2 & MAS2_W) || !(mas2 & MAS2_M))) {
|
||||
pr_err_ratelimited(
|
||||
"%s: Instuction emulation from guest addres %08lx mismatches storage attributes\n",
|
||||
"%s: Instruction emulation from guest address %08lx mismatches storage attributes\n",
|
||||
__func__, geaddr);
|
||||
return EMULATE_AGAIN;
|
||||
}
|
||||
@@ -686,7 +686,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
|
||||
|
||||
/* Guard against emulation from devices area */
|
||||
if (unlikely(!page_is_ram(pfn))) {
|
||||
pr_err_ratelimited("%s: Instruction emulation from non-RAM host addres %08llx is not supported\n",
|
||||
pr_err_ratelimited("%s: Instruction emulation from non-RAM host address %08llx is not supported\n",
|
||||
__func__, addr);
|
||||
return EMULATE_AGAIN;
|
||||
}
|
||||
|
||||
@@ -718,4 +718,4 @@ err3; stb r0,0(r3)
|
||||
|
||||
15: addi r1,r1,STACKFRAMESIZE
|
||||
b exit_vmx_usercopy /* tail call optimise */
|
||||
#endif /* CONFiG_ALTIVEC */
|
||||
#endif /* CONFIG_ALTIVEC */
|
||||
|
||||
@@ -653,4 +653,4 @@ _GLOBAL(memcpy_power7)
|
||||
15: addi r1,r1,STACKFRAMESIZE
|
||||
ld r3,-STACKFRAMESIZE+STK_REG(R31)(r1)
|
||||
b exit_vmx_copy /* tail call optimise */
|
||||
#endif /* CONFiG_ALTIVEC */
|
||||
#endif /* CONFIG_ALTIVEC */
|
||||
|
||||
@@ -67,7 +67,7 @@ static inline void _tlbil_va(unsigned long address, unsigned int pid,
|
||||
{
|
||||
__tlbil_va(address, pid);
|
||||
}
|
||||
#endif /* CONIFG_8xx */
|
||||
#endif /* CONFIG_8xx */
|
||||
|
||||
#if defined(CONFIG_PPC_BOOK3E) || defined(CONFIG_PPC_47x)
|
||||
extern void _tlbivax_bcast(unsigned long address, unsigned int pid,
|
||||
|
||||
@@ -220,7 +220,6 @@ config AKEBONO
|
||||
select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
|
||||
select MMC_SDHCI
|
||||
select MMC_SDHCI_PLTFM
|
||||
select MMC_SDHCI_OF_476GTR
|
||||
select ATA
|
||||
select SATA_AHCI_PLATFORM
|
||||
help
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ config COMMON_CLK_WM831X
|
||||
depends on MFD_WM831X
|
||||
---help---
|
||||
Supports the clocking subsystem of the WM831x/2x series of
|
||||
PMICs from Wolfson Microlectronics.
|
||||
PMICs from Wolfson Microelectronics.
|
||||
|
||||
source "drivers/clk/versatile/Kconfig"
|
||||
|
||||
|
||||
@@ -197,7 +197,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)
|
||||
|
||||
ret = allocate_resources(policy->cpu, &cpu_dev, &cpu_reg, &cpu_clk);
|
||||
if (ret) {
|
||||
pr_err("%s: Failed to allocate resources\n: %d", __func__, ret);
|
||||
pr_err("%s: Failed to allocate resources: %d\n", __func__, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -686,7 +686,7 @@ static int gpio_msm_v1_probe(struct platform_device *pdev)
|
||||
irq_set_chained_handler(irq1, msm_gpio_irq_handler);
|
||||
irq_set_chained_handler(irq2, msm_gpio_irq_handler);
|
||||
irq_set_irq_wake(irq1, 1);
|
||||
irq_set_irq_wake(irq2, 2);
|
||||
irq_set_irq_wake(irq2, 1);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -204,5 +204,5 @@ static int __init spics_gpio_init(void)
|
||||
subsys_initcall(spics_gpio_init);
|
||||
|
||||
MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>");
|
||||
MODULE_DESCRIPTION("ST Microlectronics SPEAr SPI Chip Select Abstraction");
|
||||
MODULE_DESCRIPTION("STMicroelectronics SPEAr SPI Chip Select Abstraction");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@@ -347,7 +347,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* list_entry - get the struct for this entry
|
||||
* @ptr: the &struct list_head pointer.
|
||||
* @type: the type of the struct this is embedded in.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*/
|
||||
#define list_entry(ptr, type, member) \
|
||||
container_of(ptr, type, member)
|
||||
@@ -356,7 +356,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* list_first_entry - get the first element from a list
|
||||
* @ptr: the list head to take the element from.
|
||||
* @type: the type of the struct this is embedded in.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Note, that list is expected to be not empty.
|
||||
*/
|
||||
@@ -406,7 +406,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* list_for_each_entry - iterate over list of given type
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*/
|
||||
#define list_for_each_entry(pos, head, member) \
|
||||
for (pos = list_entry((head)->next, typeof(*pos), member); \
|
||||
@@ -417,7 +417,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* list_for_each_entry_reverse - iterate backwards over list of given type.
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*/
|
||||
#define list_for_each_entry_reverse(pos, head, member) \
|
||||
for (pos = list_entry((head)->prev, typeof(*pos), member); \
|
||||
@@ -428,7 +428,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
|
||||
* @pos: the type * to use as a start point
|
||||
* @head: the head of the list
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Prepares a pos entry for use as a start point in list_for_each_entry_continue().
|
||||
*/
|
||||
@@ -439,7 +439,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* list_for_each_entry_continue - continue iteration over list of given type
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Continue to iterate over list of given type, continuing after
|
||||
* the current position.
|
||||
@@ -453,7 +453,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* list_for_each_entry_continue_reverse - iterate backwards from the given point
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Start to iterate over list of given type backwards, continuing after
|
||||
* the current position.
|
||||
@@ -467,7 +467,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* list_for_each_entry_from - iterate over list of given type from the current point
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Iterate over list of given type, continuing from current position.
|
||||
*/
|
||||
@@ -480,7 +480,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @n: another type * to use as temporary storage
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*/
|
||||
#define list_for_each_entry_safe(pos, n, head, member) \
|
||||
for (pos = list_entry((head)->next, typeof(*pos), member), \
|
||||
@@ -493,7 +493,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @n: another type * to use as temporary storage
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Iterate over list of given type, continuing after current point,
|
||||
* safe against removal of list entry.
|
||||
@@ -509,7 +509,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @n: another type * to use as temporary storage
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Iterate over list of given type from current point, safe against
|
||||
* removal of list entry.
|
||||
@@ -524,7 +524,7 @@ static inline void list_splice_tail_init(struct list_head *list,
|
||||
* @pos: the type * to use as a loop cursor.
|
||||
* @n: another type * to use as temporary storage
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Iterate backwards over list of given type, safe against removal
|
||||
* of list entry.
|
||||
|
||||
@@ -1334,7 +1334,7 @@ init_card(struct l1oip *hc, int pri, int bundle)
|
||||
if (id[l1oip_cnt] == 0) {
|
||||
printk(KERN_WARNING "Warning: No 'id' value given or "
|
||||
"0, this is highly unsecure. Please use 32 "
|
||||
"bit randmom number 0x...\n");
|
||||
"bit random number 0x...\n");
|
||||
}
|
||||
hc->id = id[l1oip_cnt];
|
||||
if (debug & DEBUG_L1OIP_INIT)
|
||||
|
||||
@@ -290,7 +290,7 @@ struct cx18_options {
|
||||
* list_entry_is_past_end - check if a previous loop cursor is off list end
|
||||
* @pos: the type * previously used as a loop cursor.
|
||||
* @head: the head for your list.
|
||||
* @member: the name of the list_struct within the struct.
|
||||
* @member: the name of the list_head within the struct.
|
||||
*
|
||||
* Check if the entry's list_head is the head of the list, thus it's not a
|
||||
* real entry but was the loop cursor that walked past the end
|
||||
|
||||
@@ -490,7 +490,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
|
||||
|
||||
if(detected == 0)
|
||||
printk("budget-patch not detected or saa7146 in non-default state.\n"
|
||||
"try enabling ressetting of 7146 with MASK_31 in MC1 register\n");
|
||||
"try enabling resetting of 7146 with MASK_31 in MC1 register\n");
|
||||
|
||||
else
|
||||
printk("BUDGET-PATCH DETECTED.\n");
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user