openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
bfaaba99e680bf82bf2cbf69866c3f37434ff766
linux-st/kernel
History
Jakub Kicinski 7df621a3ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
include/net/sock.h
  7b50ecfcc6 ("net: Rename ->stream_memory_read to ->sock_is_readable")
  4c1e34c0db ("vsock: Enable y2038 safe timeval for timeout")

drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
  0daa55d033 ("octeontx2-af: cn10k: debugfs for dumping LMTST map table")
  e77bcdd1f6 ("octeontx2-af: Display all enabled PF VF rsrc_alloc entries.")

Adjacent code addition in both cases, keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2021-10-28 10:43:58 -07:00
..
bpf
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-10-28 10:43:58 -07:00
cgroup
cgroup: Fix memory leak caused by missing cgroup_bpf_offline
2021-10-22 17:23:54 -07:00
configs
…
debug
Merge tag 'kgdb-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux
2021-09-07 12:08:04 -07:00
dma
Merge tag 'dma-mapping-5.15-2' of git://git.infradead.org/users/hch/dma-mapping
2021-10-20 10:16:51 -10:00
entry
entry: rseq: Call rseq_handle_notify_resume() in tracehook_notify_resume()
2021-09-22 10:24:01 -04:00
events
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-10-07 15:24:06 -07:00
gcov
…
irq
Merge tag 'irqchip-fixes-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
2021-09-24 14:11:04 +02:00
kcsan
Merge tag 'locking-debug-2021-09-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2021-09-02 13:00:15 -07:00
livepatch
…
locking
locking/rwbase: Take care of ordering guarantee for fastpath reader
2021-09-15 17:49:16 +02:00
power
Merge branches 'pm-pci', 'pm-sleep', 'pm-domains' and 'powercap'
2021-08-30 19:25:42 +02:00
printk
memblock: introduce saner 'memblock_free_ptr()' interface
2021-09-14 13:23:22 -07:00
rcu
Merge tag 'locking-core-2021-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2021-08-30 14:26:36 -07:00
sched
sched/scs: Reset the shadow stack when idle_task_exit
2021-10-19 17:46:11 +02:00
time
posix-cpu-timers: Prevent spuriously armed 0-value itimer
2021-09-23 11:53:51 +02:00
trace
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2021-10-28 10:43:58 -07:00
.gitignore
…
acct.c
kernel/acct.c: use dedicated helper to access rlimit values
2021-09-08 11:50:26 -07:00
async.c
…
audit_fsnotify.c
…
audit_tree.c
…
audit_watch.c
…
audit.c
…
audit.h
…
auditfilter.c
…
auditsc.c
audit: fix possible null-pointer dereference in audit_filter_rules
2021-10-18 18:27:47 -04:00
backtracetest.c
…
bounds.c
…
capability.c
…
cfi.c
…
compat.c
arch: remove compat_alloc_user_space
2021-09-08 15:32:35 -07:00
configs.c
…
context_tracking.c
…
cpu_pm.c
…
cpu.c
…
crash_core.c
…
crash_dump.c
…
cred.c
ucounts: Move get_ucounts from cred_alloc_blank to key_change_session_keyring
2021-10-20 10:34:20 -05:00
delayacct.c
…
dma.c
…
exec_domain.c
…
exit.c
…
extable.c
…
fail_function.c
…
fork.c
mm/hugetlb: initialize hugetlb_usage in mm_init
2021-09-08 18:45:53 -07:00
freezer.c
…
futex.c
futex: Remove unused variable 'vpid' in futex_proxy_trylock_atomic()
2021-09-03 23:00:22 +02:00
gen_kheaders.sh
…
groups.c
…
hung_task.c
…
iomem.c
…
irq_work.c
…
jump_label.c
…
kallsyms.c
…
kcmp.c
…
Kconfig.freezer
…
Kconfig.hz
…
Kconfig.locks
…
Kconfig.preempt
…
kcov.c
…
kexec_core.c
Merge branch 'rework/printk_safe-removal' into for-linus
2021-08-30 16:36:10 +02:00
kexec_elf.c
…
kexec_file.c
…
kexec_internal.h
…
kexec.c
kexec: avoid compat_alloc_user_space
2021-09-08 15:32:34 -07:00
kheaders.c
…
kmod.c
…
kprobes.c
…
ksysfs.c
…
kthread.c
…
latencytop.c
…
Makefile
…
module_signature.c
…
module_signing.c
…
module-internal.h
…
module.c
module: fix clang CFI with MODULE_UNLOAD=n
2021-09-28 12:56:26 +02:00
notifier.c
…
nsproxy.c
memcg: enable accounting for new namesapces and struct nsproxy
2021-09-03 09:58:12 -07:00
padata.c
padata: Remove repeated verbose license text
2021-08-27 16:30:18 +08:00
panic.c
Merge branch 'rework/printk_safe-removal' into for-linus
2021-08-30 16:36:10 +02:00
params.c
…
pid_namespace.c
memcg: enable accounting for new namesapces and struct nsproxy
2021-09-03 09:58:12 -07:00
pid.c
…
profile.c
profiling: fix shift-out-of-bounds bugs
2021-09-08 11:50:26 -07:00
ptrace.c
…
range.c
…
reboot.c
…
regset.c
…
relay.c
…
resource_kunit.c
…
resource.c
…
rseq.c
KVM: rseq: Update rseq when processing NOTIFY_RESUME on xfer to KVM guest
2021-09-22 10:24:01 -04:00
scftorture.c
…
scs.c
…
seccomp.c
Merge branch 'exit-cleanups-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2021-09-01 14:52:05 -07:00
signal.c
Merge branch 'ucount-fixes-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2021-10-21 17:27:17 -10:00
smp.c
…
smpboot.c
…
smpboot.h
…
softirq.c
…
stackleak.c
…
stacktrace.c
…
static_call.c
…
stop_machine.c
…
sys_ni.c
compat: remove some compat entry points
2021-09-08 15:32:35 -07:00
sys.c
Merge branch 'akpm' (patches from Andrew)
2021-09-08 12:55:35 -07:00
sysctl-test.c
…
sysctl.c
Merge branch 'akpm' (patches from Andrew)
2021-09-03 10:08:28 -07:00
task_work.c
…
taskstats.c
…
test_kprobes.c
…
torture.c
…
tracepoint.c
…
tsacct.c
…
ucount.c
ucounts: Fix signal ucount refcounting
2021-10-18 16:02:30 -05:00
uid16.c
…
uid16.h
…
umh.c
…
up.c
…
user_namespace.c
memcg: enable accounting for new namesapces and struct nsproxy
2021-09-03 09:58:12 -07:00
user-return-notifier.c
…
user.c
fs/epoll: use a per-cpu counter for user's watches count
2021-09-08 11:50:27 -07:00
usermode_driver.c
…
utsname_sysctl.c
…
utsname.c
…
watch_queue.c
…
watchdog_hld.c
…
watchdog.c
…
workqueue_internal.h
…
workqueue.c
workqueue: fix state-dump console deadlock
2021-10-11 06:50:28 -10:00