Commit 49dc2b71 authored by Linus Torvalds's avatar Linus Torvalds

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
parents d66435cc d00cd819
...@@ -9,7 +9,7 @@ Please see https://www.kernel.org/ for a list of supported kernels. Any ...@@ -9,7 +9,7 @@ Please see https://www.kernel.org/ for a list of supported kernels. Any
kernel marked with [EOL] is "end of life" and will not have any fixes kernel marked with [EOL] is "end of life" and will not have any fixes
backported to it. backported to it.
If you've found a bug on a kernel version isn't listed on kernel.org, If you've found a bug on a kernel version that isn't listed on kernel.org,
contact your Linux distribution or embedded vendor for support. contact your Linux distribution or embedded vendor for support.
Alternatively, you can attempt to run one of the supported stable or -rc Alternatively, you can attempt to run one of the supported stable or -rc
kernels, and see if you can reproduce the bug on that. It's preferable kernels, and see if you can reproduce the bug on that. It's preferable
......
...@@ -168,7 +168,7 @@ static char *res_strings[] = { ...@@ -168,7 +168,7 @@ static char *res_strings[] = {
"reserved 14", "reserved 14",
"Unrecognized cell", "Unrecognized cell",
"reserved 16", "reserved 16",
"reassemby abort: AAL5 abort", "reassembly abort: AAL5 abort",
"packet purged", "packet purged",
"packet ageing timeout", "packet ageing timeout",
"channel ageing timeout", "channel ageing timeout",
......
...@@ -308,7 +308,7 @@ int nx842_crypto_compress(struct crypto_tfm *tfm, ...@@ -308,7 +308,7 @@ int nx842_crypto_compress(struct crypto_tfm *tfm,
h = !n && add_header ? hdrsize : 0; h = !n && add_header ? hdrsize : 0;
if (ignore) if (ignore)
pr_warn("interal error, ignore is set %x\n", ignore); pr_warn("internal error, ignore is set %x\n", ignore);
ret = compress(ctx, &p, &hdr->group[n], &c, &ignore, h); ret = compress(ctx, &p, &hdr->group[n], &c, &ignore, h);
if (ret) if (ret)
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
* set of these objects. * set of these objects.
* *
* Fences are used to detile GTT memory mappings. They're also connected to the * Fences are used to detile GTT memory mappings. They're also connected to the
* hardware frontbuffer render tracking and hence interract with frontbuffer * hardware frontbuffer render tracking and hence interact with frontbuffer
* conmpression. Furthermore on older platforms fences are required for tiled * compression. Furthermore on older platforms fences are required for tiled
* objects used by the display engine. They can also be used by the render * objects used by the display engine. They can also be used by the render
* engine - they're required for blitter commands and are optional for render * engine - they're required for blitter commands and are optional for render
* commands. But on gen4+ both display (with the exception of fbc) and rendering * commands. But on gen4+ both display (with the exception of fbc) and rendering
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
* *
* Finally note that because fences are such a restricted resource they're * Finally note that because fences are such a restricted resource they're
* dynamically associated with objects. Furthermore fence state is committed to * dynamically associated with objects. Furthermore fence state is committed to
* the hardware lazily to avoid unecessary stalls on gen2/3. Therefore code must * the hardware lazily to avoid unnecessary stalls on gen2/3. Therefore code must
* explictly call i915_gem_object_get_fence() to synchronize fencing status * explicitly call i915_gem_object_get_fence() to synchronize fencing status
* for cpu access. Also note that some code wants an unfenced view, for those * for cpu access. Also note that some code wants an unfenced view, for those
* cases the fence can be removed forcefully with i915_gem_object_put_fence(). * cases the fence can be removed forcefully with i915_gem_object_put_fence().
* *
...@@ -527,7 +527,7 @@ void i915_gem_restore_fences(struct drm_device *dev) ...@@ -527,7 +527,7 @@ void i915_gem_restore_fences(struct drm_device *dev)
* required. * required.
* *
* When bit 17 is XORed in, we simply refuse to tile at all. Bit * When bit 17 is XORed in, we simply refuse to tile at all. Bit
* 17 is not just a page offset, so as we page an objet out and back in, * 17 is not just a page offset, so as we page an object out and back in,
* individual pages in it will have different bit 17 addresses, resulting in * individual pages in it will have different bit 17 addresses, resulting in
* each 64 bytes being swapped with its neighbor! * each 64 bytes being swapped with its neighbor!
* *
......
...@@ -64,7 +64,7 @@ const char *usnic_ib_qp_grp_state_to_string(enum ib_qp_state state) ...@@ -64,7 +64,7 @@ const char *usnic_ib_qp_grp_state_to_string(enum ib_qp_state state)
case IB_QPS_ERR: case IB_QPS_ERR:
return "ERR"; return "ERR";
default: default:
return "UNKOWN STATE"; return "UNKNOWN STATE";
} }
} }
......
...@@ -848,7 +848,7 @@ static int wdt87xx_do_update_firmware(struct i2c_client *client, ...@@ -848,7 +848,7 @@ static int wdt87xx_do_update_firmware(struct i2c_client *client,
error = wdt87xx_get_sysparam(client, &wdt->param); error = wdt87xx_get_sysparam(client, &wdt->param);
if (error) if (error)
dev_err(&client->dev, dev_err(&client->dev,
"failed to refresh system paramaters: %d\n", error); "failed to refresh system parameters: %d\n", error);
out: out:
enable_irq(client->irq); enable_irq(client->irq);
mutex_unlock(&wdt->fw_mutex); mutex_unlock(&wdt->fw_mutex);
......
...@@ -1038,7 +1038,7 @@ static int w90p910_ether_probe(struct platform_device *pdev) ...@@ -1038,7 +1038,7 @@ static int w90p910_ether_probe(struct platform_device *pdev)
error = register_netdev(dev); error = register_netdev(dev);
if (error != 0) { if (error != 0) {
dev_err(&pdev->dev, "Regiter EMC w90p910 FAILED\n"); dev_err(&pdev->dev, "Register EMC w90p910 FAILED\n");
error = -ENODEV; error = -ENODEV;
goto failed_put_rmiiclk; goto failed_put_rmiiclk;
} }
......
...@@ -626,7 +626,7 @@ static void rtl8821ae_dm_find_minimum_rssi(struct ieee80211_hw *hw) ...@@ -626,7 +626,7 @@ static void rtl8821ae_dm_find_minimum_rssi(struct ieee80211_hw *hw)
rtl_dm_dig->min_undec_pwdb_for_dm = rtl_dm_dig->min_undec_pwdb_for_dm =
rtlpriv->dm.entry_min_undec_sm_pwdb; rtlpriv->dm.entry_min_undec_sm_pwdb;
RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD, RT_TRACE(rtlpriv, COMP_BB_POWERSAVING, DBG_LOUD,
"AP Ext Port or disconnet PWDB = 0x%x\n", "AP Ext Port or disconnect PWDB = 0x%x\n",
rtl_dm_dig->min_undec_pwdb_for_dm); rtl_dm_dig->min_undec_pwdb_for_dm);
} }
RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD, RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* All rights reserved. * All rights reserved.
* *
* Modified by fengjh at rising.com.cn * Modified by fengjh at rising.com.cn
* <http://lists.lm-sensors.org/mailman/listinfo/lm-sensors> * <lm-sensors@lm-sensors.org>
* 2006.11 * 2006.11
* *
* Code cleanup by Sergei Poselenov, <sposelenov@emcraft.com> * Code cleanup by Sergei Poselenov, <sposelenov@emcraft.com>
......
...@@ -103,8 +103,7 @@ config USB_ETH ...@@ -103,8 +103,7 @@ config USB_ETH
- CDC Ethernet Emulation Model (EEM) is a newer standard that has - CDC Ethernet Emulation Model (EEM) is a newer standard that has
a simpler interface that can be used by more USB hardware. a simpler interface that can be used by more USB hardware.
RNDIS support is an additional option, more demanding than than RNDIS support is an additional option, more demanding than subset.
subset.
Within the USB device, this gadget driver exposes a network device Within the USB device, this gadget driver exposes a network device
"usbX", where X depends on what other networking devices you have. "usbX", where X depends on what other networking devices you have.
......
...@@ -131,7 +131,7 @@ static void timekeeping_check_update(struct timekeeper *tk, cycle_t offset) ...@@ -131,7 +131,7 @@ static void timekeeping_check_update(struct timekeeper *tk, cycle_t offset)
printk_deferred(" timekeeping: Your kernel is sick, but tries to cope by capping time updates\n"); printk_deferred(" timekeeping: Your kernel is sick, but tries to cope by capping time updates\n");
} else { } else {
if (offset > (max_cycles >> 1)) { if (offset > (max_cycles >> 1)) {
printk_deferred("INFO: timekeeping: Cycle offset (%lld) is larger than the the '%s' clock's 50%% safety margin (%lld)\n", printk_deferred("INFO: timekeeping: Cycle offset (%lld) is larger than the '%s' clock's 50%% safety margin (%lld)\n",
offset, name, max_cycles >> 1); offset, name, max_cycles >> 1);
printk_deferred(" timekeeping: Your kernel is still fine, but is feeling a bit nervous\n"); printk_deferred(" timekeeping: Your kernel is still fine, but is feeling a bit nervous\n");
} }
......
...@@ -254,7 +254,7 @@ static int do_op(struct sw842_param *p, u8 o) ...@@ -254,7 +254,7 @@ static int do_op(struct sw842_param *p, u8 o)
case OP_ACTION_NOOP: case OP_ACTION_NOOP:
break; break;
default: default:
pr_err("Interal error, invalid op %x\n", op); pr_err("Internal error, invalid op %x\n", op);
return -EINVAL; return -EINVAL;
} }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* *
* \Sum_{j} p_{j} = 1, * \Sum_{j} p_{j} = 1,
* *
* This formula can be straightforwardly computed by maintaing denominator * This formula can be straightforwardly computed by maintaining denominator
* (let's call it 'd') and for each event type its numerator (let's call it * (let's call it 'd') and for each event type its numerator (let's call it
* 'n_j'). When an event of type 'j' happens, we simply need to do: * 'n_j'). When an event of type 'j' happens, we simply need to do:
* n_j++; d++; * n_j++; d++;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* particular cpu can (and will) wrap - this is fine, when we go to shutdown the * particular cpu can (and will) wrap - this is fine, when we go to shutdown the
* percpu counters will all sum to the correct value * percpu counters will all sum to the correct value
* *
* (More precisely: because moduler arithmatic is commutative the sum of all the * (More precisely: because modular arithmetic is commutative the sum of all the
* percpu_count vars will be equal to what it would have been if all the gets * percpu_count vars will be equal to what it would have been if all the gets
* and puts were done to a single integer, even if some of the percpu integers * and puts were done to a single integer, even if some of the percpu integers
* overflow or underflow). * overflow or underflow).
......
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
/* /*
* balloon_page_enqueue - allocates a new page and inserts it into the balloon * balloon_page_enqueue - allocates a new page and inserts it into the balloon
* page list. * page list.
* @b_dev_info: balloon device decriptor where we will insert a new page to * @b_dev_info: balloon device descriptor where we will insert a new page to
* *
* Driver must call it to properly allocate a new enlisted balloon page * Driver must call it to properly allocate a new enlisted balloon page
* before definetively removing it from the guest system. * before definitively removing it from the guest system.
* This function returns the page address for the recently enqueued page or * This function returns the page address for the recently enqueued page or
* NULL in the case we fail to allocate a new page this turn. * NULL in the case we fail to allocate a new page this turn.
*/ */
......
...@@ -132,6 +132,6 @@ static void __exit ovs_geneve_tnl_exit(void) ...@@ -132,6 +132,6 @@ static void __exit ovs_geneve_tnl_exit(void)
module_init(ovs_geneve_tnl_init); module_init(ovs_geneve_tnl_init);
module_exit(ovs_geneve_tnl_exit); module_exit(ovs_geneve_tnl_exit);
MODULE_DESCRIPTION("OVS: Geneve swiching port"); MODULE_DESCRIPTION("OVS: Geneve switching port");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS("vport-type-5"); MODULE_ALIAS("vport-type-5");
...@@ -153,7 +153,7 @@ int main(void) ...@@ -153,7 +153,7 @@ int main(void)
alarmcount = 0; alarmcount = 0;
if (timer_create(alarm_clock_id, &se, &tm1) == -1) { if (timer_create(alarm_clock_id, &se, &tm1) == -1) {
printf("timer_create failled, %s unspported?\n", printf("timer_create failed, %s unsupported?\n",
clockstring(alarm_clock_id)); clockstring(alarm_clock_id));
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment