Commit f8ddadc4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



There were quite a few overlapping sets of changes here.

Daniel's bug fix for off-by-ones in the new BPF branch instructions,
along with the added allowances for "data_end > ptr + x" forms
collided with the metadata additions.

Along with those three changes came veritifer test cases, which in
their final form I tried to group together properly.  If I had just
trimmed GIT's conflict tags as-is, this would have split up the
meta tests unnecessarily.

In the socketmap code, a set of preemption disabling changes
overlapped with the rename of bpf_compute_data_end() to
bpf_compute_data_pointers().

Changes were made to the mv88e6060.c driver set addr method
which got removed in net-next.

The hyperv transport socket layer had a locking change in 'net'
which overlapped with a change of socket state macro usage
in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bdd091ba b5ac3beb

Documentation/ABI/testing/sysfs-kernel-mm-swap

+0 −10
Original line number Diff line number Diff line
@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead. 
		still used for tmpfs etc. other users.  If set to

		false, the global swap readahead algorithm will be

		used for all swappable pages.
 


What:		/sys/kernel/mm/swap/vma_ra_max_order

Date:		August 2017

Contact:	Linux memory management mailing list <linux-mm@kvack.org>

Description:	The max readahead size in order for VMA based swap readahead



		VMA based swap readahead algorithm will readahead at

		most 1 << max_order pages for each readahead.  The

		real readahead size for each readahead will be scaled

		according to the estimation algorithm.

Documentation/core-api/kernel-api.rst

+0 −14
Original line number Diff line number Diff line
@@ -352,44 +352,30 @@ Read-Copy Update (RCU) 
----------------------



.. kernel-doc:: include/linux/rcupdate.h

   :external:



.. kernel-doc:: include/linux/rcupdate_wait.h

   :external:



.. kernel-doc:: include/linux/rcutree.h

   :external:



.. kernel-doc:: kernel/rcu/tree.c

   :external:



.. kernel-doc:: kernel/rcu/tree_plugin.h

   :external:



.. kernel-doc:: kernel/rcu/tree_exp.h

   :external:



.. kernel-doc:: kernel/rcu/update.c

   :external:



.. kernel-doc:: include/linux/srcu.h

   :external:



.. kernel-doc:: kernel/rcu/srcutree.c

   :external:



.. kernel-doc:: include/linux/rculist_bl.h

   :external:



.. kernel-doc:: include/linux/rculist.h

   :external:



.. kernel-doc:: include/linux/rculist_nulls.h

   :external:



.. kernel-doc:: include/linux/rcu_sync.h

   :external:



.. kernel-doc:: kernel/rcu/sync.c

   :external:

Documentation/process/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Below are the essential guides that every developer should read. 
   submitting-patches

   coding-style

   email-clients

   kernel-enforcement-statement



Other guides to the community that are of interest to most developers are:

Documentation/process/kernel-enforcement-statement.rst

0 → 100644
+147 −0
Original line number Diff line number Diff line 
Linux Kernel Enforcement Statement

----------------------------------



As developers of the Linux kernel, we have a keen interest in how our software

is used and how the license for our software is enforced.  Compliance with the

reciprocal sharing obligations of GPL-2.0 is critical to the long-term

sustainability of our software and community.



Although there is a right to enforce the separate copyright interests in the

contributions made to our community, we share an interest in ensuring that

individual enforcement actions are conducted in a manner that benefits our

community and do not have an unintended negative impact on the health and

growth of our software ecosystem.  In order to deter unhelpful enforcement

actions, we agree that it is in the best interests of our development

community to undertake the following commitment to users of the Linux kernel

on behalf of ourselves and any successors to our copyright interests:



    Notwithstanding the termination provisions of the GPL-2.0, we agree that

    it is in the best interests of our development community to adopt the

    following provisions of GPL-3.0 as additional permissions under our

    license with respect to any non-defensive assertion of rights under the

    license.



	However, if you cease all violation of this License, then your license

	from a particular copyright holder is reinstated (a) provisionally,

	unless and until the copyright holder explicitly and finally

	terminates your license, and (b) permanently, if the copyright holder

	fails to notify you of the violation by some reasonable means prior to

	60 days after the cessation.



	Moreover, your license from a particular copyright holder is

	reinstated permanently if the copyright holder notifies you of the

	violation by some reasonable means, this is the first time you have

	received notice of violation of this License (for any work) from that

	copyright holder, and you cure the violation prior to 30 days after

	your receipt of the notice.



Our intent in providing these assurances is to encourage more use of the

software.  We want companies and individuals to use, modify and distribute

this software.  We want to work with users in an open and transparent way to

eliminate any uncertainty about our expectations regarding compliance or

enforcement that might limit adoption of our software.  We view legal action

as a last resort, to be initiated only when other community efforts have

failed to resolve the problem.



Finally, once a non-compliance issue is resolved, we hope the user will feel

welcome to join us in our efforts on this project.  Working together, we will

be stronger.



Except where noted below, we speak only for ourselves, and not for any company

we might work for today, have in the past, or will in the future.



  - Bjorn Andersson (Linaro)

  - Andrea Arcangeli (Red Hat)

  - Neil Armstrong

  - Jens Axboe

  - Pablo Neira Ayuso

  - Khalid Aziz

  - Ralf Baechle

  - Felipe Balbi

  - Arnd Bergmann

  - Ard Biesheuvel

  - Paolo Bonzini (Red Hat)

  - Christian Borntraeger

  - Mark Brown (Linaro)

  - Paul Burton

  - Javier Martinez Canillas

  - Rob Clark

  - Jonathan Corbet

  - Vivien Didelot (Savoir-faire Linux)

  - Hans de Goede (Red Hat)

  - Mel Gorman (SUSE)

  - Sven Eckelmann

  - Alex Elder (Linaro)

  - Fabio Estevam

  - Larry Finger

  - Bhumika Goyal

  - Andy Gross

  - Juergen Gross

  - Shawn Guo

  - Ulf Hansson

  - Tejun Heo

  - Rob Herring

  - Masami Hiramatsu

  - Michal Hocko

  - Simon Horman

  - Johan Hovold (Hovold Consulting AB)

  - Christophe JAILLET

  - Olof Johansson

  - Lee Jones (Linaro)

  - Heiner Kallweit

  - Srinivas Kandagatla

  - Jan Kara

  - Shuah Khan (Samsung)

  - David Kershner

  - Jaegeuk Kim

  - Namhyung Kim

  - Colin Ian King

  - Jeff Kirsher

  - Greg Kroah-Hartman (Linux Foundation)

  - Christian König

  - Vinod Koul

  - Krzysztof Kozlowski

  - Viresh Kumar

  - Aneesh Kumar K.V

  - Julia Lawall

  - Doug Ledford (Red Hat)

  - Chuck Lever (Oracle)

  - Daniel Lezcano

  - Shaohua Li

  - Xin Long (Red Hat)

  - Tony Luck

  - Mike Marshall

  - Chris Mason

  - Paul E. McKenney

  - David S. Miller

  - Ingo Molnar

  - Kuninori Morimoto

  - Borislav Petkov

  - Jiri Pirko

  - Josh Poimboeuf

  - Sebastian Reichel (Collabora)

  - Guenter Roeck

  - Joerg Roedel

  - Leon Romanovsky

  - Steven Rostedt (VMware)

  - Ivan Safonov

  - Ivan Safonov

  - Anna Schumaker

  - Jes Sorensen

  - K.Y. Srinivasan

  - Heiko Stuebner

  - Jiri Kosina (SUSE)

  - Dmitry Torokhov

  - Linus Torvalds

  - Thierry Reding

  - Rik van Riel

  - Geert Uytterhoeven (Glider bvba)

  - Daniel Vetter

  - Linus Walleij

  - Richard Weinberger

  - Dan Williams

  - Rafael J. Wysocki

  - Arvind Yadav

  - Masahiro Yamada

  - Wei Yongjun

  - Lv Zheng

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -5351,9 +5351,7 @@ M: "J. Bruce Fields" <bfields@fieldses.org> 
L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	include/linux/fcntl.h

F:	include/linux/fs.h

F:	include/uapi/linux/fcntl.h

F:	include/uapi/linux/fs.h

F:	fs/fcntl.c

F:	fs/locks.c
@@ -5362,6 +5360,8 @@ M: Alexander Viro <viro@zeniv.linux.org.uk> 
L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	fs/*

F:	include/linux/fs.h

F:	include/uapi/linux/fs.h



FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER

M:	Riku Voipio <riku.voipio@iki.fi>
@@ -7576,7 +7576,7 @@ F: arch/mips/include/asm/kvm* 
F:	arch/mips/kvm/



KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)

M:	Alexander Graf <agraf@suse.com>

M:	Paul Mackerras <paulus@ozlabs.org>

L:	kvm-ppc@vger.kernel.org

W:	http://www.linux-kvm.org/

T:	git git://github.com/agraf/linux-2.6.git

CRA Git | Maintained and supported by SUSTech CRA and CCSE