Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+22 -23
+1 -1
REPORTING-BUGS
··· 9 9 kernel marked with [EOL] is "end of life" and will not have any fixes 10 10 backported to it. 11 11 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, 13 13 contact your Linux distribution or embedded vendor for support. 14 14 Alternatively, you can attempt to run one of the supported stable or -rc 15 15 kernels, and see if you can reproduce the bug on that. It's preferable
+1 -1
drivers/atm/firestream.c
··· 168 168 "reserved 14", 169 169 "Unrecognized cell", 170 170 "reserved 16", 171 - "reassemby abort: AAL5 abort", 171 + "reassembly abort: AAL5 abort", 172 172 "packet purged", 173 173 "packet ageing timeout", 174 174 "channel ageing timeout",
+1 -1
drivers/crypto/nx/nx-842.c
··· 308 308 h = !n && add_header ? hdrsize : 0; 309 309 310 310 if (ignore) 311 - pr_warn("interal error, ignore is set %x\n", ignore); 311 + pr_warn("internal error, ignore is set %x\n", ignore); 312 312 313 313 ret = compress(ctx, &p, &hdr->group[n], &c, &ignore, h); 314 314 if (ret)
+5 -5
drivers/gpu/drm/i915/i915_gem_fence.c
··· 34 34 * set of these objects. 35 35 * 36 36 * 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 39 39 * objects used by the display engine. They can also be used by the render 40 40 * engine - they're required for blitter commands and are optional for render 41 41 * commands. But on gen4+ both display (with the exception of fbc) and rendering ··· 46 46 * 47 47 * Finally note that because fences are such a restricted resource they're 48 48 * 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 51 51 * for cpu access. Also note that some code wants an unfenced view, for those 52 52 * cases the fence can be removed forcefully with i915_gem_object_put_fence(). 53 53 * ··· 527 527 * required. 528 528 * 529 529 * 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, 531 531 * individual pages in it will have different bit 17 addresses, resulting in 532 532 * each 64 bytes being swapped with its neighbor! 533 533 *
+1 -1
drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
··· 64 64 case IB_QPS_ERR: 65 65 return "ERR"; 66 66 default: 67 - return "UNKOWN STATE"; 67 + return "UNKNOWN STATE"; 68 68 69 69 } 70 70 }
+1 -1
drivers/input/touchscreen/wdt87xx_i2c.c
··· 848 848 error = wdt87xx_get_sysparam(client, &wdt->param); 849 849 if (error) 850 850 dev_err(&client->dev, 851 - "failed to refresh system paramaters: %d\n", error); 851 + "failed to refresh system parameters: %d\n", error); 852 852 out: 853 853 enable_irq(client->irq); 854 854 mutex_unlock(&wdt->fw_mutex);
+1 -1
drivers/net/ethernet/nuvoton/w90p910_ether.c
··· 1038 1038 1039 1039 error = register_netdev(dev); 1040 1040 if (error != 0) { 1041 - dev_err(&pdev->dev, "Regiter EMC w90p910 FAILED\n"); 1041 + dev_err(&pdev->dev, "Register EMC w90p910 FAILED\n"); 1042 1042 error = -ENODEV; 1043 1043 goto failed_put_rmiiclk; 1044 1044 }
+1 -1
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
··· 626 626 rtl_dm_dig->min_undec_pwdb_for_dm = 627 627 rtlpriv->dm.entry_min_undec_sm_pwdb; 628 628 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", 630 630 rtl_dm_dig->min_undec_pwdb_for_dm); 631 631 } 632 632 RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
+1 -1
drivers/rtc/rtc-rx8025.c
··· 7 7 * All rights reserved. 8 8 * 9 9 * Modified by fengjh at rising.com.cn 10 - * <http://lists.lm-sensors.org/mailman/listinfo/lm-sensors> 10 + * <lm-sensors@lm-sensors.org> 11 11 * 2006.11 12 12 * 13 13 * Code cleanup by Sergei Poselenov, <sposelenov@emcraft.com>
+1 -2
drivers/usb/gadget/legacy/Kconfig
··· 103 103 - CDC Ethernet Emulation Model (EEM) is a newer standard that has 104 104 a simpler interface that can be used by more USB hardware. 105 105 106 - RNDIS support is an additional option, more demanding than than 107 - subset. 106 + RNDIS support is an additional option, more demanding than subset. 108 107 109 108 Within the USB device, this gadget driver exposes a network device 110 109 "usbX", where X depends on what other networking devices you have.
+1 -1
kernel/time/timekeeping.c
··· 131 131 printk_deferred(" timekeeping: Your kernel is sick, but tries to cope by capping time updates\n"); 132 132 } else { 133 133 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", 135 135 offset, name, max_cycles >> 1); 136 136 printk_deferred(" timekeeping: Your kernel is still fine, but is feeling a bit nervous\n"); 137 137 }
+1 -1
lib/842/842_decompress.c
··· 254 254 case OP_ACTION_NOOP: 255 255 break; 256 256 default: 257 - pr_err("Interal error, invalid op %x\n", op); 257 + pr_err("Internal error, invalid op %x\n", op); 258 258 return -EINVAL; 259 259 } 260 260
+1 -1
lib/flex_proportions.c
··· 17 17 * 18 18 * \Sum_{j} p_{j} = 1, 19 19 * 20 - * This formula can be straightforwardly computed by maintaing denominator 20 + * This formula can be straightforwardly computed by maintaining denominator 21 21 * (let's call it 'd') and for each event type its numerator (let's call it 22 22 * 'n_j'). When an event of type 'j' happens, we simply need to do: 23 23 * n_j++; d++;
+1 -1
lib/percpu-refcount.c
··· 12 12 * particular cpu can (and will) wrap - this is fine, when we go to shutdown the 13 13 * percpu counters will all sum to the correct value 14 14 * 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 16 16 * percpu_count vars will be equal to what it would have been if all the gets 17 17 * and puts were done to a single integer, even if some of the percpu integers 18 18 * overflow or underflow).
+2 -2
mm/balloon_compaction.c
··· 13 13 /* 14 14 * balloon_page_enqueue - allocates a new page and inserts it into the balloon 15 15 * 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 17 17 * 18 18 * 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. 20 20 * This function returns the page address for the recently enqueued page or 21 21 * NULL in the case we fail to allocate a new page this turn. 22 22 */
+1 -1
net/openvswitch/vport-geneve.c
··· 132 132 module_init(ovs_geneve_tnl_init); 133 133 module_exit(ovs_geneve_tnl_exit); 134 134 135 - MODULE_DESCRIPTION("OVS: Geneve swiching port"); 135 + MODULE_DESCRIPTION("OVS: Geneve switching port"); 136 136 MODULE_LICENSE("GPL"); 137 137 MODULE_ALIAS("vport-type-5");
+1 -1
tools/testing/selftests/timers/alarmtimer-suspend.c
··· 153 153 154 154 alarmcount = 0; 155 155 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", 157 157 clockstring(alarm_clock_id)); 158 158 break; 159 159 }