History

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

Small conflict around locking in rxrpc_process_event() - channel_lock moved to bundle in next, while state lock needs _bh() from net.

Jakub Kicinski committed 6 years ago

Commit 9d49aea2 parents 9faebeb 3fdd47c74 files · +1942 −564Browse files

Showing the changes to include/uapi/linux (1 of 74 files). Show all

Unified · Split

include/uapi/linux/rxrpc.h+1−1
@@ -51,11 +51,11 @@ enum rxrpc_cmsg_type { · 50 unmodified lines
51 RXRPC_BUSY = 6, /* -r: server busy received [terminal] */51 RXRPC_BUSY = 6, /* -r: server busy received [terminal] */
52 RXRPC_LOCAL_ERROR = 7, /* -r: local error generated [terminal] */52 RXRPC_LOCAL_ERROR = 7, /* -r: local error generated [terminal] */
53 RXRPC_NEW_CALL = 8, /* -r: [Service] new incoming call notification */53 RXRPC_NEW_CALL = 8, /* -r: [Service] new incoming call notification */
54 RXRPC_ACCEPT = 9, /* s-: [Service] accept request */
55 RXRPC_EXCLUSIVE_CALL = 10, /* s-: Call should be on exclusive connection */54 RXRPC_EXCLUSIVE_CALL = 10, /* s-: Call should be on exclusive connection */
56 RXRPC_UPGRADE_SERVICE = 11, /* s-: Request service upgrade for client call */55 RXRPC_UPGRADE_SERVICE = 11, /* s-: Request service upgrade for client call */
57 RXRPC_TX_LENGTH = 12, /* s-: Total length of Tx data */56 RXRPC_TX_LENGTH = 12, /* s-: Total length of Tx data */
58 RXRPC_SET_CALL_TIMEOUT = 13, /* s-: Set one or more call timeouts */57 RXRPC_SET_CALL_TIMEOUT = 13, /* s-: Set one or more call timeouts */
58 RXRPC_CHARGE_ACCEPT = 14, /* s-: Charge the accept pool with a user call ID */
59 RXRPC__SUPPORTED59 RXRPC__SUPPORTED
60};60};
61 61