Skip to content

Commit 49dc2b7

Browse files
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: drivers/rtc: broken link fix drm/i915 Fix typos in i915_gem_fence.c Docs: fix missing word in REPORTING-BUGS lib+mm: fix few spelling mistakes MAINTAINERS: add git URL for APM driver treewide: Fix typo in printk
2 parents d66435c + d00cd81 commit 49dc2b7

File tree

17 files changed

+22
-23
lines changed

17 files changed

+22
-23
lines changed

REPORTING-BUGS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Please see https://www.kernel.org/ for a list of supported kernels. Any
99
kernel marked with [EOL] is "end of life" and will not have any fixes
1010
backported to it.
1111

12-
If you've found a bug on a kernel version isn't listed on kernel.org,
12+
If you've found a bug on a kernel version that isn't listed on kernel.org,
1313
contact your Linux distribution or embedded vendor for support.
1414
Alternatively, you can attempt to run one of the supported stable or -rc
1515
kernels, and see if you can reproduce the bug on that. It's preferable

drivers/atm/firestream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ static char *res_strings[] = {
168168
"reserved 14",
169169
"Unrecognized cell",
170170
"reserved 16",
171-
"reassemby abort: AAL5 abort",
171+
"reassembly abort: AAL5 abort",
172172
"packet purged",
173173
"packet ageing timeout",
174174
"channel ageing timeout",

drivers/crypto/nx/nx-842.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ int nx842_crypto_compress(struct crypto_tfm *tfm,
308308
h = !n && add_header ? hdrsize : 0;
309309

310310
if (ignore)
311-
pr_warn("interal error, ignore is set %x\n", ignore);
311+
pr_warn("internal error, ignore is set %x\n", ignore);
312312

313313
ret = compress(ctx, &p, &hdr->group[n], &c, &ignore, h);
314314
if (ret)

drivers/gpu/drm/i915/i915_gem_fence.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
* set of these objects.
3535
*
3636
* Fences are used to detile GTT memory mappings. They're also connected to the
37-
* hardware frontbuffer render tracking and hence interract with frontbuffer
38-
* conmpression. Furthermore on older platforms fences are required for tiled
37+
* hardware frontbuffer render tracking and hence interact with frontbuffer
38+
* compression. Furthermore on older platforms fences are required for tiled
3939
* objects used by the display engine. They can also be used by the render
4040
* engine - they're required for blitter commands and are optional for render
4141
* commands. But on gen4+ both display (with the exception of fbc) and rendering
@@ -46,8 +46,8 @@
4646
*
4747
* Finally note that because fences are such a restricted resource they're
4848
* dynamically associated with objects. Furthermore fence state is committed to
49-
* the hardware lazily to avoid unecessary stalls on gen2/3. Therefore code must
50-
* explictly call i915_gem_object_get_fence() to synchronize fencing status
49+
* the hardware lazily to avoid unnecessary stalls on gen2/3. Therefore code must
50+
* explicitly call i915_gem_object_get_fence() to synchronize fencing status
5151
* for cpu access. Also note that some code wants an unfenced view, for those
5252
* cases the fence can be removed forcefully with i915_gem_object_put_fence().
5353
*
@@ -527,7 +527,7 @@ void i915_gem_restore_fences(struct drm_device *dev)
527527
* required.
528528
*
529529
* When bit 17 is XORed in, we simply refuse to tile at all. Bit
530-
* 17 is not just a page offset, so as we page an objet out and back in,
530+
* 17 is not just a page offset, so as we page an object out and back in,
531531
* individual pages in it will have different bit 17 addresses, resulting in
532532
* each 64 bytes being swapped with its neighbor!
533533
*

drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const char *usnic_ib_qp_grp_state_to_string(enum ib_qp_state state)
6464
case IB_QPS_ERR:
6565
return "ERR";
6666
default:
67-
return "UNKOWN STATE";
67+
return "UNKNOWN STATE";
6868

6969
}
7070
}

drivers/input/touchscreen/wdt87xx_i2c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ static int wdt87xx_do_update_firmware(struct i2c_client *client,
848848
error = wdt87xx_get_sysparam(client, &wdt->param);
849849
if (error)
850850
dev_err(&client->dev,
851-
"failed to refresh system paramaters: %d\n", error);
851+
"failed to refresh system parameters: %d\n", error);
852852
out:
853853
enable_irq(client->irq);
854854
mutex_unlock(&wdt->fw_mutex);

drivers/net/ethernet/nuvoton/w90p910_ether.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ static int w90p910_ether_probe(struct platform_device *pdev)
10381038

10391039
error = register_netdev(dev);
10401040
if (error != 0) {
1041-
dev_err(&pdev->dev, "Regiter EMC w90p910 FAILED\n");
1041+
dev_err(&pdev->dev, "Register EMC w90p910 FAILED\n");
10421042
error = -ENODEV;
10431043
goto failed_put_rmiiclk;
10441044
}

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ static void rtl8821ae_dm_find_minimum_rssi(struct ieee80211_hw *hw)
626626
rtl_dm_dig->min_undec_pwdb_for_dm =
627627
rtlpriv->dm.entry_min_undec_sm_pwdb;
628628
RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
629-
"AP Ext Port or disconnet PWDB = 0x%x\n",
629+
"AP Ext Port or disconnect PWDB = 0x%x\n",
630630
rtl_dm_dig->min_undec_pwdb_for_dm);
631631
}
632632
RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,

drivers/rtc/rtc-rx8025.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* All rights reserved.
88
*
99
* Modified by fengjh at rising.com.cn
10-
* <http://lists.lm-sensors.org/mailman/listinfo/lm-sensors>
10+
* <lm-sensors@lm-sensors.org>
1111
* 2006.11
1212
*
1313
* Code cleanup by Sergei Poselenov, <[email protected]>

drivers/usb/gadget/legacy/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ config USB_ETH
103103
- CDC Ethernet Emulation Model (EEM) is a newer standard that has
104104
a simpler interface that can be used by more USB hardware.
105105

106-
RNDIS support is an additional option, more demanding than than
107-
subset.
106+
RNDIS support is an additional option, more demanding than subset.
108107

109108
Within the USB device, this gadget driver exposes a network device
110109
"usbX", where X depends on what other networking devices you have.

kernel/time/timekeeping.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static void timekeeping_check_update(struct timekeeper *tk, cycle_t offset)
131131
printk_deferred(" timekeeping: Your kernel is sick, but tries to cope by capping time updates\n");
132132
} else {
133133
if (offset > (max_cycles >> 1)) {
134-
printk_deferred("INFO: timekeeping: Cycle offset (%lld) is larger than the the '%s' clock's 50%% safety margin (%lld)\n",
134+
printk_deferred("INFO: timekeeping: Cycle offset (%lld) is larger than the '%s' clock's 50%% safety margin (%lld)\n",
135135
offset, name, max_cycles >> 1);
136136
printk_deferred(" timekeeping: Your kernel is still fine, but is feeling a bit nervous\n");
137137
}

lib/842/842_decompress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static int do_op(struct sw842_param *p, u8 o)
254254
case OP_ACTION_NOOP:
255255
break;
256256
default:
257-
pr_err("Interal error, invalid op %x\n", op);
257+
pr_err("Internal error, invalid op %x\n", op);
258258
return -EINVAL;
259259
}
260260

lib/flex_proportions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
* \Sum_{j} p_{j} = 1,
1919
*
20-
* This formula can be straightforwardly computed by maintaing denominator
20+
* This formula can be straightforwardly computed by maintaining denominator
2121
* (let's call it 'd') and for each event type its numerator (let's call it
2222
* 'n_j'). When an event of type 'j' happens, we simply need to do:
2323
* n_j++; d++;

lib/percpu-refcount.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* particular cpu can (and will) wrap - this is fine, when we go to shutdown the
1313
* percpu counters will all sum to the correct value
1414
*
15-
* (More precisely: because moduler arithmatic is commutative the sum of all the
15+
* (More precisely: because modular arithmetic is commutative the sum of all the
1616
* percpu_count vars will be equal to what it would have been if all the gets
1717
* and puts were done to a single integer, even if some of the percpu integers
1818
* overflow or underflow).

mm/balloon_compaction.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
/*
1414
* balloon_page_enqueue - allocates a new page and inserts it into the balloon
1515
* page list.
16-
* @b_dev_info: balloon device decriptor where we will insert a new page to
16+
* @b_dev_info: balloon device descriptor where we will insert a new page to
1717
*
1818
* Driver must call it to properly allocate a new enlisted balloon page
19-
* before definetively removing it from the guest system.
19+
* before definitively removing it from the guest system.
2020
* This function returns the page address for the recently enqueued page or
2121
* NULL in the case we fail to allocate a new page this turn.
2222
*/

net/openvswitch/vport-geneve.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,6 @@ static void __exit ovs_geneve_tnl_exit(void)
132132
module_init(ovs_geneve_tnl_init);
133133
module_exit(ovs_geneve_tnl_exit);
134134

135-
MODULE_DESCRIPTION("OVS: Geneve swiching port");
135+
MODULE_DESCRIPTION("OVS: Geneve switching port");
136136
MODULE_LICENSE("GPL");
137137
MODULE_ALIAS("vport-type-5");

tools/testing/selftests/timers/alarmtimer-suspend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ int main(void)
153153

154154
alarmcount = 0;
155155
if (timer_create(alarm_clock_id, &se, &tm1) == -1) {
156-
printf("timer_create failled, %s unspported?\n",
156+
printf("timer_create failed, %s unsupported?\n",
157157
clockstring(alarm_clock_id));
158158
break;
159159
}

0 commit comments

Comments
 (0)