Commit 90223c11 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Conflicts:

drivers/net/ethernet/freescale/fec_main.c
  6ead9c98 ("net: fec: remove the xdp_return_frame when lack of tx BDs")
  144470c8 ("net: fec: using the standard return codes when xdp xmit errors")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1ecaf17d 1f594fe7

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -364,6 +364,11 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org> 
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>

Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>

Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,10 @@ S: Panoramastrasse 18 
S: D-69126 Heidelberg

S: Germany



N: Neil Horman

M: nhorman@tuxdriver.com

D: SCTP protocol maintainer.



N: Simon Horman

M: horms@verge.net.au

D: Renesas ARM/ARM64 SoC maintainer

Documentation/block/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ Block 
   kyber-iosched

   null_blk

   pr

   request

   stat

   switching-sched

   writeback_cache_control

Documentation/block/request.rst

deleted100644 → 0
+0 −99
Original line number Diff line number Diff line 
============================

struct request documentation

============================



Jens Axboe <jens.axboe@oracle.com> 27/05/02





.. FIXME:

   No idea about what does mean - seems just some noise, so comment it



   1.0

   Index



   2.0 Struct request members classification



       2.1 struct request members explanation



   3.0





   2.0







Short explanation of request members

====================================



Classification flags:



	=	====================

	D	driver member

	B	block layer member

	I	I/O scheduler member

	=	====================



Unless an entry contains a D classification, a device driver must not access

this member. Some members may contain D classifications, but should only be

access through certain macros or functions (eg ->flags).



<linux/blkdev.h>



=============================== ======= =======================================

Member				Flag	Comment

=============================== ======= =======================================

struct list_head queuelist	BI	Organization on various internal

					queues



``void *elevator_private``	I	I/O scheduler private data



unsigned char cmd[16]		D	Driver can use this for setting up

					a cdb before execution, see

					blk_queue_prep_rq



unsigned long flags		DBI	Contains info about data direction,

					request type, etc.



int rq_status			D	Request status bits



kdev_t rq_dev			DBI	Target device



int errors			DB	Error counts



sector_t sector			DBI	Target location



unsigned long hard_nr_sectors	B	Used to keep sector sane



unsigned long nr_sectors	DBI	Total number of sectors in request



unsigned long hard_nr_sectors	B	Used to keep nr_sectors sane



unsigned short nr_phys_segments	DB	Number of physical scatter gather

					segments in a request



unsigned short nr_hw_segments	DB	Number of hardware scatter gather

					segments in a request



unsigned int current_nr_sectors	DB	Number of sectors in first segment

					of request



unsigned int hard_cur_sectors	B	Used to keep current_nr_sectors sane



int tag				DB	TCQ tag, if assigned



``void *special``		D	Free to be used by driver



``char *buffer``		D	Map of first segment, also see

					section on bouncing SECTION



``struct completion *waiting``	D	Can be used by driver to get signalled

					on request completion



``struct bio *bio``		DBI	First bio in request



``struct bio *biotail``		DBI	Last bio in request



``struct request_queue *q``	DB	Request queue this request belongs to



``struct request_list *rl``	B	Request list this request came from

=============================== ======= =======================================

Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ properties: 


        properties:

          data-lanes:

            minItems: 1

            maxItems: 2



        required: