Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (6e0e846e) · Commits · jan.koester / Linux

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -627,6 +627,10 @@ S: 48287 Sawleaf
		S: Fremont, California 94539
		S: USA

		N: Tomas Cech
		E: sleep_walker@suse.com
		D: arm/palm treo support

		N: Florent Chabaud
		E: florent.chabaud@polytechnique.org
		D: software suspend

+1 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ if:
		- allwinner,sun8i-a83t-display-engine
		- allwinner,sun8i-r40-display-engine
		- allwinner,sun9i-a80-display-engine
		- allwinner,sun20i-d1-display-engine
		- allwinner,sun50i-a64-display-engine

		then:

+5 −3

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ through which it can issue requests and negotiate::
		void (issue_read)(struct netfs_io_subrequest subreq);
		bool (is_still_valid)(struct netfs_io_request rreq);
		int (check_write_begin)(struct file file, loff_t pos, unsigned len,
		struct folio folio, void *_fsdata);
		struct folio foliop, void _fsdata);
		void (done)(struct netfs_io_request rreq);
		};

		@@ -381,8 +381,10 @@ The operations are as follows:
		allocated/grabbed the folio to be modified to allow the filesystem to flush
		conflicting state before allowing it to be modified.

		It should return 0 if everything is now fine, -EAGAIN if the folio should be
		regrabbed and any other error code to abort the operation.
		It may unlock and discard the folio it was given and set the caller's folio
		pointer to NULL. It should return 0 if everything is now fine (``*foliop``
		left set) or the op should be retried (``*foliop`` cleared) and any other
		error code to abort the operation.

		* ``done``