Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

REPORTING-BUGS

+1 −1
Original line number Diff line number Diff line
@@ -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

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.

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

drivers/atm/firestream.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static char *res_strings[] = { 
	"reserved 14", 

	"Unrecognized cell", 

	"reserved 16", 

	"reassemby abort: AAL5 abort", 

	"reassembly abort: AAL5 abort", 

	"packet purged", 

	"packet ageing timeout", 

	"channel ageing timeout",

drivers/crypto/nx/nx-842.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ int nx842_crypto_compress(struct crypto_tfm *tfm, 
		h = !n && add_header ? hdrsize : 0;



		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);

		if (ret)

drivers/gpu/drm/i915/i915_gem_fence.c

+5 −5
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
 * set of these objects.

 *

 * Fences are used to detile GTT memory mappings. They're also connected to the

 * hardware frontbuffer render tracking and hence interract with frontbuffer

 * conmpression. Furthermore on older platforms fences are required for tiled

 * hardware frontbuffer render tracking and hence interact with frontbuffer

 * compression. Furthermore on older platforms fences are required for tiled

 * 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

 * commands. But on gen4+ both display (with the exception of fbc) and rendering
@@ -46,8 +46,8 @@ 
 *

 * Finally note that because fences are such a restricted resource they're

 * dynamically associated with objects. Furthermore fence state is committed to

 * the hardware lazily to avoid unecessary stalls on gen2/3. Therefore code must

 * explictly call i915_gem_object_get_fence() to synchronize fencing status

 * the hardware lazily to avoid unnecessary stalls on gen2/3. Therefore code must

 * 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

 * 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) 
 * required.

 *

 * 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

 * each 64 bytes being swapped with its neighbor!

 *

drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ const char *usnic_ib_qp_grp_state_to_string(enum ib_qp_state state) 
	case IB_QPS_ERR:

		return "ERR";

	default:

		return "UNKOWN STATE";

		return "UNKNOWN STATE";



	}

}