David S. Miller 1669cb9855 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ... Steffen Klassert says: ==================== pull request (net-next): ipsec-next 2013-12-19 1) Use the user supplied policy index instead of a generated one if present. From Fan Du. 2) Make xfrm migration namespace aware. From Fan Du. 3) Make the xfrm state and policy locks namespace aware. From Fan Du. 4) Remove ancient sleeping when the SA is in acquire state, we now queue packets to the policy instead. This replaces the sleeping code. 5) Remove FLOWI_FLAG_CAN_SLEEP. This was used to notify xfrm about the posibility to sleep. The sleeping code is gone, so remove it. 6) Check user specified spi for IPComp. Thr spi for IPcomp is only 16 bit wide, so check for a valid value. From Fan Du. 7) Export verify_userspi_info to check for valid user supplied spi ranges with pfkey and netlink. From Fan Du. 8) RFC3173 states that if the total size of a compressed payload and the IPComp header is not smaller than the size of the original payload, the IP datagram must be sent in the original non-compressed form. These packets are dropped by the inbound policy check because they are not transformed. Document the need to set 'level use' for IPcomp to receive such packets anyway. From Fan Du. Please pull or let me know if there are problems. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-19 18:37:49 -05:00
..
ABI	Main batch of InfiniBand/RDMA changes for 3.13:	2013-11-18 15:36:04 -08:00
DocBook	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-12-12 11:06:13 -08:00
EDID	…
PCI	…
RCU	…
accounting	…
acpi	…
aoe	…
arm	…
arm64	…
auxdisplay	…
backlight	backlight: lp855x_bl: support new LP8555 device	2013-11-13 12:09:14 +09:00
blackfin	…
block	…
blockdev	floppy: Correct documentation of driver options when used as a module.	2013-11-08 09:10:31 -07:00
bus-devices	…
cdrom	…
cgroups	memcg: support hierarchical memory.numa_stats	2013-11-13 12:09:06 +09:00
connector	…
console	…
cpu-freq	…
cpuidle	…
cris	…
crypto	…
development-process	…
device-mapper	dm cache: update Documentation for invalidate_cblocks's range syntax	2013-12-10 16:35:15 -05:00
devicetree	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
driver-model	spi: Updates for v3.13	2013-11-12 15:01:39 +09:00
dvb	…
early-userspace	…
extcon	…
fault-injection	…
fb	…
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2013-11-22 08:38:55 -08:00
firmware_class	…
fmc	…
frv	…
gpio	Documentation: gpiolib: add 00-INDEX file	2013-12-03 13:10:48 +01:00
hid	…
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2013-11-15 16:35:10 -08:00
i2c	i2c: i801: Add Device IDs for Intel Wildcat Point-LP PCH	2013-11-14 18:38:04 +01:00
i2o	…
ia64	…
ide	…
infiniband	…
input	…
ioctl	…
isdn	…
ja_JP	…
kbuild	…
kdump	…
ko_KR	…
laptops	…
leds	…
m68k	…
make	…
memory-devices	…
metag	…
mic	misc: mic: Fix endianness issues.	2013-11-27 11:03:38 -08:00
mips	…
misc-devices	…
mmc	…
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2013-12-19 18:37:49 -05:00
nfc	…
parisc	…
pcmcia	…
power	More ACPI and power management updates for 3.13-rc1	2013-11-20 13:25:04 -08:00
powerpc	…
pps	…
prctl	…
pti	…
ptp	…
rapidio	…
s390	…
scheduler	H8/300 has been dead for several years, the kernel for it has	2013-11-12 14:13:14 +09:00
scsi	…
security	…
serial	…
sh	…
sound	…
spi	…
sysctl	vsprintf: check real user/group id for %pK	2013-11-13 12:09:14 +09:00
target	…
thermal	…
timers	…
tpm	…
trace	Documentation/trace/tracepoints.txt: add links to TRACE_EVENT documentation	2013-11-13 12:09:32 +09:00
usb	…
vDSO	…
video4linux	…
virtual	…
vm	x86, mm: do not leak page->ptl for pmd page tables	2013-11-21 16:42:28 -08:00
w1	…
watchdog	…
wimax	…
x86	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-11-12 10:48:30 +09:00
xtensa	…
zh_CN	…
.gitignore	…
00-INDEX	…
BUG-HUNTING	…
Changes	remove obsolete references to powertweak	2013-11-27 20:34:32 -08:00
CodingStyle	…
DMA-API-HOWTO.txt	…
DMA-API.txt	…
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	…
IPMI.txt	…
IRQ-affinity.txt	…
IRQ-domain.txt	…
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	…
SubmitChecklist	…
SubmittingDrivers	…
SubmittingPatches	…
VGA-softcursor.txt	…
applying-patches.txt	…
assoc_array.txt	KEYS: Fix multiple key add into associative array	2013-12-02 11:24:18 +00:00
atomic_ops.txt	…
bad_memory.txt	…
basic_profiling.txt	…
bcache.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	…
circular-buffers.txt	…
clk.txt	…
coccinelle.txt	…
cpu-hotplug.txt	MAINTAINERS: update Zwane Mwaikambo's e-mail address	2013-11-13 12:09:14 +09:00
cpu-load.txt	…
cputopology.txt	…
crc32.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	…
devices.txt	…
digsig.txt	…
dma-buf-sharing.txt	…
dmaengine.txt	…
dmatest.txt	dmatest: add a 'wait' parameter	2013-11-14 11:04:40 -08:00
dontdiff	…
dynamic-debug-howto.txt	…
edac.txt	…
efi-stub.txt	…
eisa.txt	…
email-clients.txt	…
flexible-arrays.txt	…
futex-requeue-pi.txt	…
gcov.txt	gcov: compile specific gcov implementation based on gcc version	2013-11-13 12:09:34 +09:00
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	…
irqflags-tracing.txt	…
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2013-11-21 19:46:00 -08:00
kernel-per-CPU-kthreads.txt	…
kmemcheck.txt	…
kmemleak.txt	…
kobject.txt	…
kprobes.txt	…
kref.txt	…
ldm.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	…
lockup-watchdogs.txt	…
logo.gif	…
logo.txt	…
magic-number.txt	…
md.txt	…
media-framework.txt	…
memory-barriers.txt	…
memory-hotplug.txt	…
mono.txt	…
mutex-design.txt	locking/doc: Update references to kernel/mutex.c	2013-11-11 12:41:33 +01:00
nommu-mmap.txt	…
numastat.txt	…
oops-tracing.txt	…
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
percpu-rw-semaphore.txt	…
phy.txt	…
pi-futex.txt	…
pinctrl.txt	…
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	…
pwm.txt	…
ramoops.txt	…
rbtree.txt	…
remoteproc.txt	…
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rpmsg.txt	…
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
smsc_ece1099.txt	…
sparse.txt	…
spinlocks.txt	…
stable_api_nonsense.txt	…
stable_kernel_rules.txt	…
static-keys.txt	…
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	…
this_cpu_ops.txt	…
unaligned-memory-access.txt	ether_addr_equal: Optimize implementation, remove unused compare_ether_addr	2013-12-06 16:37:43 -05:00
unicode.txt	…
unshare.txt	…
vfio.txt	…
vgaarbiter.txt	…
video-output.txt	…
vme_api.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	…
ww-mutex-design.txt	…
xz.txt	…
zorro.txt	…