iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/security/selinux
History
Jakub Kicinski 57ce6427e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

include/net/inet_sock.h
  f866fbc842de ("ipv4: fix data-races around inet->inet_id")
  c274af224269 ("inet: introduce inet->inet_flags")
https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/

Adjacent changes:

drivers/net/bonding/bond_alb.c
  e74216b8def3 ("bonding: fix macvlan over alb bond support")
  f11e5bd159b0 ("bonding: support balance-alb with openvswitch")

drivers/net/ethernet/broadcom/bgmac.c
  d6499f0b7c7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()")
  23a14488ea58 ("net: bgmac: Fix return value check for fixed_phy_register()")

drivers/net/ethernet/broadcom/genet/bcmmii.c
  32bbe64a1386 ("net: bcmgenet: Fix return value check for fixed_phy_register()")
  acf50d1adbf4 ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()")

net/sctp/socket.c
  f866fbc842de ("ipv4: fix data-races around inet->inet_id")
  b09bde5c3554 ("inet: move inet->mc_loop to inet->inet_frags")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-24 10:51:39 -07:00
..
include
selinux: make labeled NFS work when mounted before policy load
2023-05-30 17:44:34 -04:00
ss
selinux: set next pointer before attaching to list
2023-08-18 16:13:03 -04:00
.gitignore
.gitignore: add SPDX License Identifier
2020-03-25 11:50:48 +01:00
avc.c
selinux: drop return at end of void function avc_insert()
2023-05-08 16:47:32 -04:00
hooks.c
security: Constify sk in the sk_getsecid hook.
2023-07-14 08:27:33 +01:00
ibpkey.c
selinux: stop passing selinux_state pointers and their offspring
2023-03-14 15:22:45 -04:00
ima.c
selinux: adjust typos in comments
2023-05-08 16:44:01 -04:00
Kconfig
selinux: remove the runtime disable functionality
2023-03-20 12:34:23 -04:00
Makefile
selinux: fix Makefile for versions of make < v4.3
2023-06-02 15:34:29 -04:00
netif.c
selinux: stop passing selinux_state pointers and their offspring
2023-03-14 15:22:45 -04:00
netlabel.c
selinux: Implement mptcp_add_subflow hook
2023-05-18 13:11:10 -04:00
netlink.c
selinux: mark some global variables __ro_after_init
2021-01-12 10:08:55 -05:00
netnode.c
selinux: stop passing selinux_state pointers and their offspring
2023-03-14 15:22:45 -04:00
netport.c
selinux: stop passing selinux_state pointers and their offspring
2023-03-14 15:22:45 -04:00
nlmsgtab.c
selinux: resolve checkpatch errors
2022-05-03 13:59:15 -04:00
selinuxfs.c
selinux: declare read-only data arrays const
2023-05-08 16:52:05 -04:00
status.c
selinux: stop passing selinux_state pointers and their offspring
2023-03-14 15:22:45 -04:00
xfrm.c
selinux: stop passing selinux_state pointers and their offspring
2023-03-14 15:22:45 -04:00