History

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

drivers/net/can/pch_can.c ae64438be192 ("can: dev: fix skb drop check") 1dd1b521be85 ("can: remove obsolete PCH CAN driver") https://lore.kernel.org/all/20221110102509.1f7d63cc@canb.auug.org.au/

Jakub Kicinski committed 4 years ago

Commit 966a9b42 parents c1b0510 4bbf342385 files · +4395 −2203Browse files

Showing the changes to include/uapi (3 of 385 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/audit.h +1 −1
  2. include/uapi/linux/capability.h +1 −1
  3. include/uapi/linux/in.h +1 −0
include/uapi/linux/audit.h+1−1
@@ -187,7 +187,7 @@ · 186 unmodified lines
187#define AUDIT_MAX_KEY_LEN 256187#define AUDIT_MAX_KEY_LEN 256
188#define AUDIT_BITMASK_SIZE 64188#define AUDIT_BITMASK_SIZE 64
189#define AUDIT_WORD(nr) ((__u32)((nr)/32))189#define AUDIT_WORD(nr) ((__u32)((nr)/32))
190#define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32))190#define AUDIT_BIT(nr) (1U << ((nr) - AUDIT_WORD(nr)*32))
191 191
192#define AUDIT_SYSCALL_CLASSES 16192#define AUDIT_SYSCALL_CLASSES 16
193#define AUDIT_CLASS_DIR_WRITE 0193#define AUDIT_CLASS_DIR_WRITE 0
include/uapi/linux/capability.h+1−1
@@ -426,7 +426,7 @@ struct vfs_ns_cap_data { · 425 unmodified lines
426 */426 */
427 427
428#define CAP_TO_INDEX(x) ((x) >> 5) /* 1 << 5 == bits in __u32 */428#define CAP_TO_INDEX(x) ((x) >> 5) /* 1 << 5 == bits in __u32 */
429#define CAP_TO_MASK(x) (1 << ((x) & 31)) /* mask for indexed __u32 */429#define CAP_TO_MASK(x) (1U << ((x) & 31)) /* mask for indexed __u32 */
430 430
431 431
432#endif /* _UAPI_LINUX_CAPABILITY_H */432#endif /* _UAPI_LINUX_CAPABILITY_H */
include/uapi/linux/in.h+1−0
@@ -20,6 +20,7 @@ · 19 unmodified lines
20#define _UAPI_LINUX_IN_H20#define _UAPI_LINUX_IN_H
21 21
22#include <linux/types.h>22#include <linux/types.h>
23#include <linux/stddef.h>
23#include <linux/libc-compat.h>24#include <linux/libc-compat.h>
24#include <linux/socket.h>25#include <linux/socket.h>
25 26