Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (5b91c5cc) · Commits · EulixOS / Software / Kernel

Documentation/arm64/silicon-errata.rst

+2 −0

+1 −1

Original line number	Diff line number	Diff line
		@@ -242,7 +242,7 @@ example:

		int rectangle_area(struct shape *this)
		{
		struct rectangle *self = container_of(this, struct shape, parent);
		struct rectangle *self = container_of(this, struct rectangle, parent);

		return self->length * self->width;
		};

+16 −0

Original line number	Diff line number	Diff line
		@@ -462,6 +462,10 @@ operation table looks like the following::
		struct iov_iter *iter,
		netfs_io_terminated_t term_func,
		void *term_func_priv);

		int (query_occupancy)(struct netfs_cache_resources cres,
		loff_t start, size_t len, size_t granularity,
		loff_t _data_start, size_t _data_len);
		};

		With a termination handler function pointer::
		@@ -536,6 +540,18 @@ The methods defined in the table are:
		indicating whether the termination is definitely happening in the caller's
		context.

		* ``query_occupancy()``

		[Required] Called to find out where the next piece of data is within a
		particular region of the cache. The start and length of the region to be
		queried are passed in, along with the granularity to which the answer needs
		to be aligned. The function passes back the start and length of the data,
		if any, available within that region. Note that there may be a hole at the
		front.

		It returns 0 if some data was found, -ENODATA if there was no usable data
		within the region or -ENOBUFS if there is no caching on this file.

		Note that these methods are passed a pointer to the cache resource structure,
		not the read request structure as they could be used in other situations where
		there isn't a read request structure as well, such as writing dirty data to the

+0 −24

Original line number	Diff line number	Diff line
		@@ -300,30 +300,6 @@ Contact: Daniel Vetter, Noralf Tronnes

		Level: Advanced

		Garbage collect fbdev scrolling acceleration
		--------------------------------------------

		Scroll acceleration has been disabled in fbcon. Now it works as the old
		SCROLL_REDRAW mode. A ton of code was removed in fbcon.c and the hook bmove was
		removed from fbcon_ops.
		Remaining tasks:

		- a bunch of the hooks in fbcon_ops could be removed or simplified by calling
		directly instead of the function table (with a switch on p->rotate)

		- fb_copyarea is unused after this, and can be deleted from all drivers

		- after that, fb_copyarea can be deleted from fb_ops in include/linux/fb.h as
		well as cfb_copyarea

		Note that not all acceleration code can be deleted, since clearing and cursor
		support is still accelerated, which might be good candidates for further
		deletion projects.

		Contact: Daniel Vetter

		Level: Intermediate

		idr_init_base()
		---------------

+3 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ Code Seq# Include File Comments
		'B' 00-1F linux/cciss_ioctl.h conflict!
		'B' 00-0F include/linux/pmu.h conflict!
		'B' C0-FF advanced bbus <mailto:maassen@uni-freiburg.de>
		'B' 00-0F xen/xenbus_dev.h conflict!
		'C' all linux/soundcard.h conflict!
		'C' 01-2F linux/capi.h conflict!
		'C' F0-FF drivers/net/wan/cosa.h conflict!
		@@ -134,6 +135,7 @@ Code Seq# Include File Comments
		'F' 80-8F linux/arcfb.h conflict!
		'F' DD video/sstfb.h conflict!
		'G' 00-3F drivers/misc/sgi-gru/grulib.h conflict!
		'G' 00-0F xen/gntalloc.h, xen/gntdev.h conflict!
		'H' 00-7F linux/hiddev.h conflict!
		'H' 00-0F linux/hidraw.h conflict!
		'H' 01 linux/mei.h conflict!
		@@ -176,6 +178,7 @@ Code Seq# Include File Comments
		'P' 60-6F sound/sscape_ioctl.h conflict!
		'P' 00-0F drivers/usb/class/usblp.c conflict!
		'P' 01-09 drivers/misc/pci_endpoint_test.c conflict!
		'P' 00-0F xen/privcmd.h conflict!
		'Q' all linux/soundcard.h
		'R' 00-1F linux/random.h conflict!
		'R' 01 linux/rfkill.h conflict!