David S. Miller
77f0379fa8
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next ...
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
A small batch with accumulated updates in nf-next, mostly IPVS updates,
they are:
1) Add 64-bits stats counters to IPVS, from Julian Anastasov.
2) Move NETFILTER_XT_MATCH_ADDRTYPE out of NETFILTER_ADVANCED as docker
seem to require this, from Anton Blanchard.
3) Use boolean instead of numeric value in set_match_v*(), from
coccinelle via Fengguang Wu.
4) Allows rescheduling of new connections in IPVS when port reuse is
detected, from Marcelo Ricardo Leitner.
5) Add missing bits to support arptables extensions from nft_compat,
from Arturo Borrero.
Patrick is preparing a large batch to enhance the set infrastructure,
named expressions among other things, that should follow up soon after
this batch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-02 14:55:05 -05:00
Staging drivers patches for 3.20-rc1
2015-02-15 11:30:39 -08:00
ACPI / Documentation: add a missing '='
2015-01-22 01:21:45 +01:00
ARM: SoC platform changes
2015-02-17 09:27:54 -08:00
arm64: Emulate SETEND for AArch32 tasks
2015-01-23 17:11:44 +00:00
Documentation: fix blackfin gptimers-example build errors
2015-01-28 12:07:58 -07:00
Merge branch 'for-3.19/core' of git://git.kernel.dk/linux-block
2014-12-13 14:14:23 -08:00
mm: memcontrol: default hierarchy interface for memory
2015-02-11 17:06:02 -08:00
intel_pstate: Add num_pstates to sysfs
2015-01-30 01:52:17 +01:00
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2015-03-02 14:47:12 -05:00
Update of Documentation/dmaengine/00-INDEX
2014-12-29 15:28:24 -07:00
Fix the DocBook build failure caused by the move of the i2o subsystem to
2015-02-17 17:02:04 -08:00
Staging drivers patches for 3.20-rc1
2015-02-15 11:30:39 -08:00
dax: does not work correctly with virtual aliasing caches
2015-02-16 17:56:04 -08:00
gpio: board.txt: Fix the gpio name example
2015-01-28 11:14:00 -07:00
hwmon: (ina2xx) Add ina231 compatible string
2015-01-25 21:23:59 -08:00
Documentation: i2c: Use PM ops instead of legacy suspend/resume
2014-12-04 19:09:03 +01:00
Docs changes for the 3.19 merge window
2014-12-12 14:42:48 -08:00
kernel: add panic_on_warn
2014-12-10 17:41:10 -08:00
Documentation changes for 3.20
2015-02-11 13:03:11 -08:00
Documentation: Build mic/mpssd only for x86_64
2014-12-05 11:18:36 -05:00
Documentation/misc-devices/mei: Fix indentation of embedded code.
2015-01-29 12:56:20 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-03-02 14:55:05 -05:00
Documentation: Add documentation for Nios2 architecture
2014-12-08 12:56:06 +08:00
PM / sleep: Mention async suspend in PM_TRACE documentation
2015-01-30 01:29:46 +01:00
Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD
2015-01-15 23:34:34 -08:00
s390/docs: Remove section about script debugging from Debugging390.txt
2015-01-15 11:11:14 +01:00
doc: brief user documentation for completion
2015-01-30 11:19:25 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2014-12-12 10:08:06 -08:00
KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y
2015-01-22 22:34:32 +00:00
ALSA: hda - Add "eapd" model string for AD1986A codec
2014-12-10 14:00:13 +01:00
Merge branch 'akpm' (patches from Andrew)
2015-02-11 18:23:28 -08:00
Documentation/target: Update fabric_ops to latest code
2015-01-06 13:46:49 -08:00
Documentation: thermal: document of_cpufreq_cooling_register()
2015-01-06 14:39:17 -04:00
Char / Misc patches for 3.20-rc1
2015-02-15 10:48:44 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-02-10 18:57:15 -08:00
MODULE_DEVICE_TABLE: fix some callsites
2015-02-13 21:21:40 -08:00
KVM: s390: add cpu model support
2015-02-09 12:44:13 +01:00
mm:add KPF_ZERO_PAGE flag for /proc/kpageflags
2015-02-11 17:06:00 -08:00
x86_64: add KASan support
2015-02-13 21:21:41 -08:00
Update of Documentation/dmaengine/00-INDEX
2014-12-29 15:28:24 -07:00
rmap: drop support of non-linear mappings
2015-02-10 14:30:31 -08:00
Documentation: GNU is frequently spelled Gnu
2014-12-29 15:33:17 -07:00
clk: Change clk_ops->determine_rate to return a clk_hw as the best parent
2014-12-03 16:21:37 -08:00
CodingStyle: enable emacs display of trailing whitespace
2015-01-28 12:05:46 -07:00
Documentation/email-clients.txt: add info about Claws Mail
2014-12-02 11:55:29 -05:00
doc: Fix misnamed FUTEX_CMP_REQUEUE_PI op constants
2015-01-19 12:05:32 +01:00
scripts/gdb: add basic documentation
2015-02-17 14:34:54 -08:00
ipmi: Add SMBus interface driver (SSIF)
2014-12-11 15:04:11 -06:00
irqdomain: Introduce new interfaces to support hierarchy irqdomains
2014-11-23 13:01:45 +01:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
TTY/Serial driver patches for 3.20-rc1
2015-02-15 11:37:02 -08:00
kobject: grammar fix
2014-12-08 09:07:11 -05:00
Documentation: add description for FTRACE probe status
2015-02-04 16:05:44 -05:00
kselftest: Move the docs to the Documentation dir
2014-11-24 10:49:54 -07:00
percpu: update local_ops.txt to reflect this_cpu operations
2014-12-13 12:42:53 -08:00
documentation: Fix smp typo in memory-barriers.txt
2015-01-07 08:59:32 -08:00
fs: introduce f_op->mmap_capabilities for nommu mmap support
2015-01-20 14:02:58 -07:00
livepatch: kernel: add TAINT_LIVEPATCH
2014-12-22 15:40:48 +01:00
phy: improved lookup method
2014-11-21 19:48:50 +05:30
pstore-ram: Allow optional mapping with pgprot_noncached
2014-12-11 13:38:31 -08:00
rfkill: document rfkill module parameters
2015-01-09 23:22:12 +01:00
stable_kernel_rules: reorganize and update submission options
2015-01-12 05:04:12 -08:00
Merge branch 'doc/sp-update' into docs-next
2015-01-29 13:11:58 -07:00
77f0379fa8
