Commit 0ca8d3ca authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Build failure in drivers/net/wwan/mhi_wwan_mbim.c:
add missing parameter (0, assuming we don't want buffer pre-alloc).

Conflict in drivers/net/dsa/sja1105/sja1105_main.c between:
  589918df ("net: dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too")
  0fac6aa0 ("net: dsa: sja1105: delete the best_effort_vlan_filtering mode")

Follow the instructions from the commit message of the former commit
- removed the if conditions. When looking at commit 589918df ("net:
dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too")
note that the mask_iotag fields get removed by the following patch.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 23809a72 902e7f37

Documentation/networking/netdev-FAQ.rst

+17 −0
Original line number Diff line number Diff line
@@ -228,6 +228,23 @@ before posting to the mailing list. The patchwork build bot instance 
gets overloaded very easily and netdev@vger really doesn't need more

traffic if we can help it.



netdevsim is great, can I extend it for my out-of-tree tests?

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



No, `netdevsim` is a test vehicle solely for upstream tests.

(Please add your tests under tools/testing/selftests/.)



We also give no guarantees that `netdevsim` won't change in the future

in a way which would break what would normally be considered uAPI.



Is netdevsim considered a "user" of an API?

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



Linux kernel has a long standing rule that no API should be added unless

it has a real, in-tree user. Mock-ups and tests based on `netdevsim` are

strongly encouraged when adding new APIs, but `netdevsim` in itself

is **not** considered a use case/user.



Any other tips to help ensure my net/net-next patch gets OK'd?

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

Attention to detail.  Re-read your own work as if you were the

Documentation/networking/operstates.rst

+4 −2
Original line number Diff line number Diff line
@@ -73,7 +73,9 @@ IF_OPER_LOWERLAYERDOWN (3): 
 state (f.e. VLAN).



IF_OPER_TESTING (4):

 Unused in current kernel.

 Interface is in testing mode, for example executing driver self-tests

 or media (cable) test. It can't be used for normal traffic until tests

 complete.



IF_OPER_DORMANT (5):

 Interface is L1 up, but waiting for an external event, f.e. for a
@@ -111,7 +113,7 @@ it as lower layer. 


Note that for certain kind of soft-devices, which are not managing any

real hardware, it is possible to set this bit from userspace.  One

should use TVL IFLA_CARRIER to do so.

should use TLV IFLA_CARRIER to do so.



netif_carrier_ok() can be used to query that bit.

Makefile

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 5

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Opossums on Parade



# *DOCUMENTATION*
@@ -546,7 +546,6 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \ 
PHONY += scripts_basic

scripts_basic:

	$(Q)$(MAKE) $(build)=scripts/basic

	$(Q)rm -f .tmp_quiet_recordmcount



PHONY += outputmakefile

ifdef building_out_of_srctree

arch/powerpc/kernel/vdso64/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ KASAN_SANITIZE := n 


ccflags-y := -shared -fno-common -fno-builtin -nostdlib \

	-Wl,-soname=linux-vdso64.so.1 -Wl,--hash-style=both



# Go prior to 1.16.x assumes r30 is not clobbered by any VDSO code. That used to be true

# by accident when the VDSO was hand-written asm code, but may not be now that the VDSO is

# compiler generated. To avoid breaking Go tell GCC not to use r30. Impact on code

# generation is minimal, it will just use r29 instead.

ccflags-y += $(call cc-option, -ffixed-r30)



asflags-y := -D__VDSO64__ -s



targets += vdso64.lds

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
#include "../../../../drivers/pci/pci.h"



DEFINE_STATIC_KEY_FALSE(shared_processor);

EXPORT_SYMBOL_GPL(shared_processor);

EXPORT_SYMBOL(shared_processor);



int CMO_PrPSP = -1;

int CMO_SecPSP = -1;