Difference between revisions of "Upstream kernel commits"

From CRIU
Jump to navigation Jump to search
Line 322: Line 322:
 
|{{linux-cr.git|85f70a00}} || tcp: initialize rcv_tstamp for restored sockets || v3.11 || merged
 
|{{linux-cr.git|85f70a00}} || tcp: initialize rcv_tstamp for restored sockets || v3.11 || merged
 
|-
 
|-
|{{linux-cr.git|81841048}} || tcp: set timestamps for restored skb-s || v3.11 || merged
+
|{{torvalds.git|7ed5c5ae}} || tcp: set timestamps for restored skb-s || v3.11 || merged
 
|-
 
|-
 
|{{torvalds.git|6dec97dc}} || mm: move_ptes -- Set soft dirty bit depending on pte type || v3.11 || merged
 
|{{torvalds.git|6dec97dc}} || mm: move_ptes -- Set soft dirty bit depending on pte type || v3.11 || merged

Revision as of 12:06, 16 December 2014

The pending patches series.


Reference Description Status
http://www.spinics.net/lists/linux-mm/msg78828.html aio: Make it possible to remap aio ring In AIO-next tree


The commits we have merged into mainline kernel (or maintainer repo) for C/R functionality.


Commit Description Version Status
torvalds: 7773fbc541 procfs: make proc_get_link to use dentry instead of inode v3.3 merged
torvalds: 640708a2cff procfs: introduce the /proc/<pid>/map_files/ directory v3.3 merged
torvalds: 067bce1a06 c/r: introduce CHECKPOINT_RESTORE symbol v3.3 merged
torvalds: 028ee4be34 c/r: prctl: add PR_SET_MM codes to set up mm_struct entries v3.3 merged
torvalds: b3f7f573a2 c/r: procfs: add start_data, end_data, start_brk members to /proc/$pid/stat v4 v3.3 merged
torvalds: b8f566b04d sysctl: add the kernel.ns_last_pid control v3.3 merged
net-next: c9da99e647 unix_diag: Fixup RQLEN extension report v3.3 merged
net-next: 885ee74d5d af_unix: Move CINQ/COUTQ code to helpers v3.3 merged
net-next: 257b529876 unix_diag: Add the MEMINFO extension v3.3 merged
net-next: c0636faa53 inet_diag: Add the SKMEMINFO extension v3.3 merged
net-next: 5d2e5f274f sock_diag: Introduce the meminfo nla core (v2) v3.3 merged
net-next: 288461e154 unix_diag: Include unix_diag.h into header-y target v3.3 merged
net-next: e6fe2371bd sock_diag: Arrange sock_diag.h such that it is exportable to userspace v3.3 merged
net-next: e09e9d189b unix: If we happen to find peer NULL when diag dumping, write zero. v3.3 merged
net-next: 3b0723c12e unix_diag: Fix incoming connections nla length v3.3 merged
net-next: 2ea744a583 net: unix -- Add missing module.h inclusion v3.3 merged
net-next: 5d531aaa64 unix_diag: Write it into kbuild v3.3 merged
net-next: cbf391958a unix_diag: Receive queue lenght NLA v3.3 merged
net-next: 2aac7a2cb0 unix_diag: Pending connections IDs NLA v3.3 merged
net-next: ac02be8d96 unix_diag: Unix peer inode NLA v3.3 merged
net-next: 5f7b056946 unix_diag: Unix inode info NLA v3.3 merged
net-next: f5248b48a6 unix_diag: Unix socket name NLA v3.3 merged
net-next: 5d3cae8bc3 unix_diag: Dumping exact socket core v3.3 merged
net-next: 45a96b9be6 unix_diag: Dumping all sockets core v3.3 merged
net-next: 22931d3b90 unix_diag: Basic module skeleton v3.3 merged
net-next: fa7ff56f75 af_unix: Export stuff required for diag module v3.3 merged
net-next: f65c1b534b sock_diag: Generalize requests cookies managements v3.3 merged
net-next: aec8dc62f6 sock_diag: Fix module netlink aliases v3.3 merged
net-next: e7c466e58e sock_diag: Move the SOCK_DIAG_BY_FAMILY cmd declaration v3.3 merged
net-next: 86e62ad6b2 udp_diag: Fix the !ipv6 case v3.3 merged
net-next: b872a2371f udp_diag: Make it module when ipv6 is a module v3.3 merged
net-next: 507dd7961e udp_diag: Wire the udp_diag module into kbuild v3.3 merged
net-next: b6d640c228 udp_diag: Implement the dump-all functionality v3.3 merged
net-next: a925aa00a5 udp_diag: Implement the get_exact dumping functionality v3.3 merged
net-next: 52b7c59bc3 udp_diag: Basic skeleton v3.3 merged
net-next: fce823381e udp: Export code sk lookup routines v3.3 merged
net-next: 1942c518ca inet_diag: Generalize inet_diag dump and get_exact calls v3.3 merged
net-next: 3c4d05c805 inet_diag: Introduce the inet socket dumping routine v3.3 merged
net-next: 8d07d1518a inet_diag: Introduce the byte-code run on an inet socket v3.3 merged
net-next: efb3cb428d inet_diag: Split inet_diag_get_exact into parts v3.3 merged
net-next: 476f7dbff3 inet_diag: Split inet_diag_get_exact into parts v3.3 merged
net-next: b005ab4ef8 inet_diag: Export inet diag cookie checking routine v3.3 merged
net-next: 87c22ea52e inet_diag: Reduce the number of args for bytecode run routine v3.3 merged
net-next: 7b35eadd7e inet_diag: Remove indirect sizeof from inet diag handlers v3.3 merged
net-next: 8ef874bfc7 sock_diag: Move the sock_ code to net/core/ v3.3 merged
net-next: a029fe26b6 inet_diag: Cleanup type2proto last user v3.3 merged
net-next: d23deaa07b inet_diag: Introduce socket family checks v3.3 merged
net-next: 25c4cd2b6d inet_diag: Switch the _dump to work with new header v3.3 merged
net-next: fe50ce2846 inet_diag: Switch the _get_exact to work with new header v3.3 merged
net-next: 126fdc3249 inet_diag: Introduce new inet_diag_req header v3.3 merged
net-next: d366477a52 sock_diag: Initial skeleton v3.3 merged
net-next: f13c95f0e2 inet_diag: Switch from _GETSOCK to IPPROTO_ numbers v3.3 merged
net-next: 37f352b5e3 inet_diag: Move byte-code finding up the call-stack v3.3 merged
net-next: 8d34172dfd sock_diag: Introduce new message type v3.3 merged
torvalds: 818411616b fs, proc: Introduce /proc/<pid>/task/<tid>/children entry v9 v3.5 merged
torvalds: 5b172087f9 c/r: procfs: add arg_start/end, env_start/end and exit_code members v3.5 merged
torvalds: fe8c7f5cbf c/r: prctl: Extend PR_SET_MM to set up more mm_struct entries v3.5 merged
torvalds: d97b46a646 syscalls, x86: Add __NR_kcmp syscall v3.5 merged
torvalds: b32dfe3771 c/r: prctl: Add ability to set new mm_struct::exe_file v3.5 merged
torvalds: 79f0713d40 prctl: Use CAP_SYS_RESOURCE for PR_SET_MM option v3.3 merged
torvalds: 300f786b26 prctl: add ability to get clear_tid_address v3.5 merged
torvalds: 4934b0329f datagram: Factor out sk queue referencing v3.4 merged
torvalds: 3f518bf745 datagram: Add offset argument to __skb_recv_datagram v3.4 merged
torvalds: da5ef6e51b skb: Add skb_peek_next helper v3.4 merged
torvalds: ef64a54f6e sock: Introduce the SO_PEEK_OFF sock option v3.4 merged
torvalds: f55bb7f9cb unix: Support peeking offset for datagram and seqpacket sockets v3.4 merged
torvalds: fc0d753641 unix: Support peeking offset for stream sockets v3.4 merged
torvalds: 1d151c337d fcntl: Add F_GETOWNER_UIDS option v3 v3.6 merged
torvalds: 370816aef0 tcp: Move code around v3.5 merged
torvalds: ee9952831c tcp: Initial repair mode v3.5 merged
torvalds: c0e88ff0f2 tcp: Repair socket queues v3.5 merged
torvalds: 5e6a3ce657 tcp: Report mss_clamp with TCP_MAXSEG option in repair mode v3.5 merged
torvalds: b139ba4e90 tcp: Repair connection-time negotiated parameters v3.5 merged
torvalds: de248a75c3 tcp repair: Fix unaligned access when repairing options (v2) v3.5 merged
torvalds: 736f24d5e5 c/r: prctl: Drop VMA flags test on PR_SET_MM_ stack data assignment v3.5 merged
torvalds: 5702c5eeab c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place v3.5 merged
torvalds: 16fbdce62d proc: report file/anon bit in /proc/pid/pagemap v3.5 merged
torvalds: bca1554373 proc/smaps: show amount of nonlinear ptes in vma v3.5 merged
torvalds: b14f243a42 net: Dont use ifindices in hash fns v3.7 merged
torvalds: 9c7dafbfab net: Allow to create links with given ifindex v3.7 merged
torvalds: e6f8f1a739 veth: Allow to create peer link with given ifindex v3.7 merged
torvalds: aa79e66eee net: Make ifindex generation per-net namespace v3.7 merged
torvalds: 1fb9489bf1 net: Loopback ifindex is constant now v3.7 merged
torvalds: faf60af17f procfs: Move /proc/pid/fd[info] handling code to fd.[ch] v3.7 merged
torvalds: ddd3e0771b procfs: Convert /proc/pid/fdinfo/ handling routines to seq-file v3.7 merged
torvalds: 55985dd72a procfs: Add ability to plug in auxiliary fdinfo providers v3.8 merged
torvalds: cbac5542d4 fs, eventfd: Add procfs fdinfo helper v3.8 merged
torvalds: 138d22b586 fs, epoll: Add procfs fdinfo helper v2 v3.8 merged
torvalds: 711c7bf991 fs, exportfs: Add export_encode_inode_fh helper v3.8 merged
torvalds: be77196b80 fs, notify: Add procfs fdinfo helper v3.8 merged
torvalds: e6dbcafb74 fs, fanotify: Add @mflags field to fanotify output v3.8 merged
torvalds: 2787b04b6c packet: Introduce net/packet/internal.h header v3.7 merged
torvalds: 96ec632714 packet: Diag core and basic socket info dumping v3.7 merged
torvalds: 8a360be0c5 packet: Report more packet sk info via diag module v3.7 merged
torvalds: eea68e2f1a packet: Report socket mclist info via diag module v3.7 merged
torvalds: 16f01365fa packet: Report rings cfg via diag engine v3.7 merged
torvalds: fff3321d75 packet: Report fanout status via diag engine v3.7 merged
torvalds: 0fa7fa98db packet: Protect packet sk list with mutex (v2) v3.7 merged
torvalds: 579035dc5d kernel: limit a value of ns_last_pid to (0, max_pid) v3.6 merged
torvalds: bc26ccd8fc tcp: restore rcv_wscale in a repair mode (v2) v3.6 merged
torvalds: f7b86bfe8d sockopt: Make SO_BINDTODEVICE readable v3.8 merged
torvalds: e4e541a848 sock-diag: Report shutdown for inet and unix sockets (v2) v3.8 merged
torvalds: 834f82e2aa procfs: add VmFlags field in smaps output v3.8 merged
torvalds: 06026d911c tty: pty - Move TIOCPKT handling into pty.c v3.8 merged
torvalds: c6298038bc tty, ioctls -- Add new ioctl definitions for tty flags fetching v3.8 merged
torvalds: 84fd7bdf12 tty: Add get- ioctls to fetch tty status v3 v3.8 merged
torvalds: a8fc927780 sk-filter: Add ability to get socket filter program (v2) v3.8 merged
torvalds: cacb6ba0f3 net: inet_diag -- Return error code if protocol handler is missed v3.7 merged
torvalds: c454e6111d tcp-repair: Handle zero-length data put in rcv queue v3.7 merged
torvalds: ec34232575 tcp: fix retransmission in repair mode v3.7 merged
torvalds: 2b9164771e ipv6: adapt connect for repair move v3.8 merged
torvalds: c91f6df2db sockopt: Change getsockopt() of SO_BINDTODEVICE to return an interface name v3.8 merged
torvalds: 3fcfe78658 ipc: add more comments to message copying related code v3.8 merged
torvalds: 51eeacaa07 ipc: simplify message copying v3.8 merged
torvalds: b30efe2775 ipc: convert prepare_copy() from macro to function v3.8 merged
torvalds: 85398aa8de ipc: simplify free_copy() call v3.8 merged
torvalds: 3a665531a3 selftests: IPC message queue copy feature test v3.8 merged
torvalds: 4a674f34ba ipc: introduce message queue copy feature v3.8 merged
torvalds: f9dd87f473 ipc: message queue receive cleanup v3.8 merged
torvalds: 03f5956680 ipc: add sysctl to specify desired next object id v3.8 merged
torvalds: 9afdacda02 ipc: remove forced assignment of selected message v3.8 merged
torvalds: 3f7d1fe108 arm: Wire up kcmp syscall v3.10 merged
torvalds: 1e142b29e2 kcmp: make it depend on CHECKPOINT_RESTORE v3.9 merged
torvalds: ceaa1fef65 tcp: adding a per-socket timestamp offset v3.9 merged
torvalds: 93be6ce0e9 tcp: set and get per-socket timestamp v3.9 merged
torvalds: ee684b6f28 tcp: send packets with a socket timestamp v3.9 merged
torvalds: 66dd34ad signal: allow to send any siginfo to itself v3.9 merged
torvalds: ae5fc987 net: fix *_DIAG_MAX constants v3.9 merged
torvalds: 0f29c768 net: prepare netlink code for netlink diag v3.10 merged
torvalds: eaaa3139 netlink: Diag core and basic socket info dumping (v2) v3.10 merged
torvalds: 84c751bd ptrace: add ability to retrieve signals without removing from a queue (v4) v3.10 merged
torvalds: 040fa020 clear_refs: Sanitize accepted commands declaration v3.11 merged
torvalds: af9de7eb clear_refs: Introduce private struct for mm_walk v3.11 merged
torvalds: 2b0a9f01 pagemap-introduce-pagemap_entry_t-without-pmshift-bits v3.11 merged
torvalds: 0f8975ec mm: soft-dirty bits for user memory changes tracking v3.11 merged
torvalds: 541c237c pagemap: prepare to reuse constant bits with page-shift v3.11 merged
torvalds: 57b8015e posix-timers: Show sigevent info in proc file v3.10 merged
torvalds: 48f6a7a5 posix-timers: Introduce /proc/PID/timers file v3.10 merged
torvalds: 5ed67f05 posix timers: Allocate timer id per process (v2) v3.10 merged
torvalds: 15ef0298 posix-timers: Show clock ID in proc file v3.10 merged
torvalds: 29000cae ptrace: add ability to get/set signal-blocked mask (v2) v3.11 merged
torvalds: 274038f8 tun: Report "persist" flag to userspace v3.11 merged
torvalds: 179ef71c mm: Save soft-dirty bits on swapped pages v3.11 merged
torvalds: 41bb3476 mm: Save soft-dirty bits on file pages v3.11 merged
torvalds: 76975e9c tun: Get skfilter layout v3.12 merged
torvalds: 849c9b6f tun: Allow to skip filter on attach v3.12 merged-
torvalds: 3d407a80 tun: Report whether the queue is attached or not v3.12 merged
torvalds: fb7589a1 tun: Add ability to create tun device with given index v3.12 merged
linux-cr: 2cafdead tcp: don't apply tsoffset if rcv_tsecr is zero v3.11 merged
linux-cr: 85f70a00 tcp: initialize rcv_tstamp for restored sockets v3.11 merged
torvalds: 7ed5c5ae tcp: set timestamps for restored skb-s v3.11 merged
torvalds: 6dec97dc mm: move_ptes -- Set soft dirty bit depending on pte type v3.11 merged
torvalds: c3d16e16 mm: migration -- Do not loose soft dirty bit if page is in migration state v3.12 merged
torvalds: e9cdd6e7 mm: pagemap -- Inspect _PAGE_SOFT_DIRTY only on present pages v3.12 merged
torvalds: dbde4979 tcp: don't update snd_nxt, when a socket is switched from repair mode v3.13 merged
torvalds: d9104d1c mm: track vma changes with VM_SOFTDIRTY bit v3.12 merged
torvalds: 34228d47 mm: Ignore VM_SOFTDIRTY on VMA merging v3.14 merged into 3.13 stable
torvalds: 24f91eba1 mm: don't lose the SOFT_DIRTY flag on mprotect v3.14 merged into 3.13 stable
torvalds: 49d063cb3 proc: show mnt_id in /proc/pid/fdinfo v3.15 merged
torvalds: 0bf073315 mm: Make freshly remapped file pages being softdirty unconditionally v3.15 merged
torvalds: 9aed8614a mm: Don't forget to set softdirty on file mapped fault linux-next -
torvalds: b43790eed mm: Don't forget to save file map softdiry bit on unmap v3.15 merged
torvalds: c86c97ff4 mm: Clear VM_SOFTDIRTY flag inside clear_refs_write instead of clear_soft_dirty v3.15 merged
torvalds: af9c4957c timerfd: Implement show_fdinfo method v3.17 merged
torvalds: 854d06d9f docs: Procfs -- Document timerfd output v3.17 merged
torvalds: 5442e9fbd timerfd: Implement timerfd_ioctl method to restore timerfd_ctx::ticks, v3 v3.17 merged
torvalds: 64e455079 mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared v3.18 merged
torvalds: f606b77f1 prctl: PR_SET_MM -- introduce PR_SET_MM_MAP operation v3.18 merged
torvalds: 9183df25f shm: add memfd_create() syscall 3.17 merged