David S. Miller
2745529ac7
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Couple conflicts resolved here:
1) In the MACB driver, a bug fix to properly initialize the
RX tail pointer properly overlapped with some changes
to support variable sized rings.
2) In XGBE we had a "CONFIG_PM" --> "CONFIG_PM_SLEEP" fix
overlapping with a reorganization of the driver to support
ACPI, OF, as well as PCI variants of the chip.
3) In 'net' we had several probe error path bug fixes to the
stmmac driver, meanwhile a lot of this code was cleaned up
and reorganized in 'net-next'.
4) The cls_flower classifier obtained a helper function in
'net-next' called __fl_delete() and this overlapped with
Daniel Borkamann's bug fix to use RCU for object destruction
in 'net'. It also overlapped with Jiri's change to guard
the rhashtable_remove_fast() call with a check against
tc_skip_sw().
5) In mlx4, a revert bug fix in 'net' overlapped with some
unrelated changes in 'net-next'.
6) In geneve, a stale header pointer after pskb_expand_head()
bug fix in 'net' overlapped with a large reorganization of
the same code in 'net-next'. Since the 'net-next' code no
longer had the bug in question, there was nothing to do
other than to simply take the 'net-next' hunks.
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-12-03 12:29:53 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-12-03 12:29:53 -05:00
config: android: enable CONFIG_SECCOMP
2016-10-11 15:06:32 -07:00
bpf: drop unnecessary context cast from BPF_PROG_RUN
2016-11-27 20:38:47 -05:00
gcov: add support for gcc version >= 6
2016-07-15 14:54:27 +09:00
genirq: Use irq type from irqdata instead of irqdesc
2016-11-08 15:15:19 +01:00
livepatch/module: make TAINT_LIVEPATCH module-specific
2016-08-26 14:42:08 +02:00
lockdep: Limit static allocations if PROVE_LOCKING_SMALL is defined
2016-11-18 11:33:19 -08:00
PM / sleep: fix device reference leak in test_suspend
2016-11-02 05:10:04 +01:00
Revert "printk: make reading the kernel log flush pending lines"
2016-11-14 09:31:52 -08:00
This adds a new gcc plugin named "latent_entropy". It is designed to
2016-10-15 10:03:15 -07:00
sched/autogroup: Do not use autogroup->tg in zombie threads
2016-11-22 12:33:43 +01:00
timers: Prevent base clock corruption when forwarding
2016-10-25 16:32:50 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-22 13:27:16 -05:00
audit: remove useless synchronize_net()
2016-12-01 11:29:02 -05:00
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit
2016-07-29 17:54:17 -07:00
audit: cleanup prune_tree_thread
2016-04-04 09:46:47 -04:00
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit
2016-09-01 15:55:56 -07:00
audit: add fields to exclude filter by reusing user filter
2016-06-27 11:01:00 -04:00
Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/audit
2016-10-04 14:21:41 -07:00
kernel: Add noaudit variant of ns_capable()
2016-06-06 20:16:18 +10:00
cgroup: add support for eBPF programs
2016-11-25 16:25:52 -05:00
cgroup: Use lld instead of ld when printing pids controller events_limit
2016-06-21 15:03:36 -04:00
cpu/hotplug: Use distinct name for cpu_hotplug.dep_map
2016-10-16 11:09:32 +02:00
Merge branch 'for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2016-10-14 12:18:50 -07:00
cred: Reject inodes with invalid ids in set_create_file_as()
2016-06-30 18:05:09 -05:00
sched/autogroup: Do not use autogroup->tg in zombie threads
2016-11-22 12:33:43 +01:00
fork: Add task stack refcounting sanity check and prevent premature task stack freeing
2016-11-01 07:39:17 +01:00
freezer, oom: check TIF_MEMDIE on the correct task
2016-07-28 16:07:41 -07:00
futex: Add some more function commentry
2016-09-05 17:20:18 +02:00
cred: simpler, 1D supplementary groups
2016-10-07 18:46:30 -07:00
hung_task: allow hung_task_panic when hung_task_warnings is 0
2016-10-11 15:06:33 -07:00
powerpc updates for 4.8 #2
2016-08-05 09:00:54 -04:00
kallsyms: add support for relative offsets in kallsyms address table
2016-03-15 16:55:16 -07:00
kcov: properly check if we are in an interrupt
2016-10-27 18:43:42 -07:00
kexec: allow architectures to override boot mapping
2016-08-02 19:35:27 -04:00
kexec: add restriction on kexec_load() segment sizes
2016-08-02 19:35:31 -04:00
kexec: fix double-free when failing to relocate the purgatory
2016-09-01 17:52:01 -07:00
kprobes: include <asm/sections.h> instead of <asm-generic/sections.h>
2016-10-11 15:06:31 -07:00
kexec: add a kexec_crash_loaded() function
2016-08-02 19:35:30 -04:00
kthread: better support freezable kthread workers
2016-10-11 15:06:33 -07:00
userns: Add per user namespace sysctls.
2016-08-08 13:18:58 -05:00
mm: fix cache mode of dax pmd mappings
2016-09-09 17:34:46 -07:00
Re-enable CONFIG_MODVERSIONS in a slightly weaker form
2016-11-29 16:01:30 -08:00
KEYS: Move the point of trust determination to __key_link()
2016-04-11 22:43:43 +01:00
padata: Convert to hotplug state machine
2016-09-19 21:44:30 +02:00
x86/panic: replace smp_send_stop() with kdump friendly version in panic path
2016-10-11 15:06:32 -07:00
remove lots of IS_ERR_VALUE abuses
2016-05-27 15:26:11 -07:00
Merge branch 'nsfs-ioctls' into HEAD
2016-09-22 20:00:36 -05:00
profile: Convert to hotplug state machine
2016-07-15 10:41:42 +02:00
mm: replace access_process_vm() write parameter with gup_flags
2016-10-19 08:31:25 -07:00
relay: Use irq_work instead of plain timer for deferred wakeup
2016-10-11 15:06:32 -07:00
/proc/iomem: only expose physical resource addresses to privileged users
2016-04-14 12:56:09 -07:00
bpf: drop unnecessary context cast from BPF_PROG_RUN
2016-11-27 20:38:47 -05:00
x86/signal: Add SA_{X32,IA32}_ABI sa_flags
2016-09-14 21:28:11 +02:00
smp: Allocate smp_call_on_cpu() workqueue on stack too
2016-09-22 14:49:10 +02:00
kthread/smpboot: do not park in kthread_create_on_cpu()
2016-10-11 15:06:33 -07:00
softirq: Display IRQ_POLL for irq-poll statistics
2016-10-21 15:45:47 -06:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-10-03 13:39:00 -07:00
prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
2016-05-23 17:04:14 -07:00
x86/pkeys: Fix pkeys build breakage for some non-x86 arches
2016-09-13 14:41:36 +02:00
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-10-10 13:04:49 -07:00
kernel/sysctl_binary.c: use generic UUID library
2016-05-20 17:58:30 -07:00
task_work: use READ_ONCE/lockless_dereference, avoid pi_lock if !task_works
2016-08-02 19:35:02 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-11-15 10:54:36 -05:00
torture: Convert torture_shutdown() to hrtimer
2016-08-22 10:01:49 -07:00
kernel/...: convert pr_warning to pr_warn
2016-03-22 15:36:02 -07:00
mntns: Add a limit on the number of mount namespaces.
2016-08-31 07:28:35 -05:00
cred: simpler, 1D supplementary groups
2016-10-07 18:46:30 -07:00
smp: Add function to execute a function synchronously on a CPU
2016-09-05 13:52:39 +02:00
Merge branch 'nsfs-ioctls' into HEAD
2016-09-22 20:00:36 -05:00
Merge branch 'nsfs-ioctls' into HEAD
2016-09-22 20:00:36 -05:00
Revert "perf/x86/intel, watchdog: Switch NMI watchdog to ref cycles on x86"
2016-07-10 20:58:36 +02:00
kthread: rename probe_kthread_data() to kthread_probe_data()
2016-10-11 15:06:33 -07:00
2745529ac7