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

Commit 4c033020 authored May 09, 2018 by Wolfram Sang

Merge tag 'at24-4.17-rc5-fixes-for-wolfram' of...

Merge tag 'at24-4.17-rc5-fixes-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current

Single bug-fix for a regression introduced during the 4.17 merge window.

parents 7781edae 76aa3de7

Documentation/bpf/bpf_devel_QA.txt

+9 −1

Original line number	Diff line number	Diff line
		@@ -557,6 +557,14 @@ A: Although LLVM IR generation and optimization try to stay architecture
		pulls in some header files containing file scope host assembly codes.
		- You can add "-fno-jump-tables" to work around the switch table issue.

		Otherwise, you can use bpf target.
		Otherwise, you can use bpf target. Additionally, you _must_ use bpf target
		when:

		- Your program uses data structures with pointer or long / unsigned long
		types that interface with BPF helpers or context data structures. Access
		into these structures is verified by the BPF verifier and may result
		in verification failures if the native architecture is not aligned with
		the BPF architecture, e.g. 64-bit. An example of this is
		BPF_PROG_TYPE_SK_MSG require '-target bpf'

		Happy BPF hacking!

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,13 @@ Required properties:
		- compatible:
		atmel,maxtouch

		The following compatibles have been used in various products but are
		deprecated:
		atmel,qt602240_ts
		atmel,atmel_mxt_ts
		atmel,atmel_mxt_tp
		atmel,mXT224

		- reg: The I2C address of the device

		- interrupts: The sink for the touchpad's IRQ output

Documentation/doc-guide/parse-headers.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -177,14 +177,14 @@ BUGS
		****


		Report bugs to Mauro Carvalho Chehab <mchehab@s-opensource.com>
		Report bugs to Mauro Carvalho Chehab <mchehab@kernel.org>


		COPYRIGHT
		*********


		Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab@s-opensource.com>.
		Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab+samsung@kernel.org>.

		License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.

Documentation/media/uapi/rc/keytable.c.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ file: uapi/v4l/keytable.c

		/* keytable.c - This program allows checking/replacing keys at IR

		Copyright (C) 2006-2009 Mauro Carvalho Chehab <mchehab@infradead.org>
		Copyright (C) 2006-2009 Mauro Carvalho Chehab <mchehab@kernel.org>

		This program is free software; you can redistribute it and/or modify
		it under the terms of the GNU General Public License as published by

Documentation/media/uapi/v4l/v4l2grab.c.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ file: media/v4l/v4l2grab.c
		.. code-block:: c

		/* V4L2 video picture grabber
		Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@infradead.org>
		Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@kernel.org>

		This program is free software; you can redistribute it and/or modify
		it under the terms of the GNU General Public License as published by