Linus Torvalds
aecdc33e11
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...
Pull networking changes from David Miller:
1) GRE now works over ipv6, from Dmitry Kozlov.
2) Make SCTP more network namespace aware, from Eric Biederman.
3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.
4) Make openvswitch network namespace aware, from Pravin B Shelar.
5) IPV6 NAT implementation, from Patrick McHardy.
6) Server side support for TCP Fast Open, from Jerry Chu and others.
7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel
Borkmann.
8) Increate the loopback default MTU to 64K, from Eric Dumazet.
9) Use a per-task rather than per-socket page fragment allocator for
outgoing networking traffic. This benefits processes that have very
many mostly idle sockets, which is quite common.
From Eric Dumazet.
10) Use up to 32K for page fragment allocations, with fallbacks to
smaller sizes when higher order page allocations fail. Benefits are
a) less segments for driver to process b) less calls to page
allocator c) less waste of space.
From Eric Dumazet.
11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.
12) VXLAN device driver, one way to handle VLAN issues such as the
limitation of 4096 VLAN IDs yet still have some level of isolation.
From Stephen Hemminger.
13) As usual there is a large boatload of driver changes, with the scale
perhaps tilted towards the wireless side this time around.
Fix up various fairly trivial conflicts, mostly caused by the user
namespace changes.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)
hyperv: Add buffer for extended info after the RNDIS response message.
hyperv: Report actual status in receive completion packet
hyperv: Remove extra allocated space for recv_pkt_list elements
hyperv: Fix page buffer handling in rndis_filter_send_request()
hyperv: Fix the missing return value in rndis_filter_set_packet_filter()
hyperv: Fix the max_xfer_size in RNDIS initialization
vxlan: put UDP socket in correct namespace
vxlan: Depend on CONFIG_INET
sfc: Fix the reported priorities of different filter types
sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP
sfc: Fix loopback self-test with separate_tx_channels=1
sfc: Fix MCDI structure field lookup
sfc: Add parentheses around use of bitfield macro arguments
sfc: Fix null function pointer in efx_sriov_channel_type
vxlan: virtual extensible lan
igmp: export symbol ip_mc_leave_group
netlink: add attributes to fdb interface
tg3: unconditionally select HWMON support when tg3 is enabled.
Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"
gre: fix sparse warning
...
2012-10-02 13:38:27 -07:00
kdb: Implement disable_nmi command
2012-09-26 13:42:25 -07:00
Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-10-02 10:52:28 -07:00
genirq: Export dummy_irq_chip
2012-08-21 16:14:23 +02:00
Revert "NMI watchdog: fix for lockup detector breakage on resume"
2012-08-08 20:49:45 +02:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:43:39 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:43:39 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
userns: Convert bsd process accounting to use kuid and kgid where appropriate
2012-09-18 01:01:33 -07:00
[SCSI] async: make async_synchronize_full() flush all work regardless of domain
2012-07-20 09:07:37 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
userns: Convert audit to work with user namespaces enabled
2012-09-18 01:00:26 -07:00
audit: clean up refcounting in audit-tree
2012-08-15 12:55:22 +02:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
userns: Convert audit to work with user namespaces enabled
2012-09-18 01:00:26 -07:00
userns: Teach inode_capable to understand inodes whose uids map to other namespaces.
2012-05-15 14:59:24 -07:00
Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-10-02 10:52:28 -07:00
cgroup: mark subsystems with broken hierarchy support and whine if cgroups are nested for them
2012-09-14 12:01:16 -07:00
new helper: sigsuspend()
2012-05-21 23:52:30 -04:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:46:27 -07:00
kernel/cpu_pm.c: fix various typos
2012-05-31 17:49:27 -07:00
cpusets: Remove/update outdated comments
2012-07-24 13:53:28 +02:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
userns: Make credential debugging user namespace safe.
2012-08-23 22:54:18 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
net: use a per task frag allocator
2012-09-24 16:31:37 -04:00
extable: Skip sorting if sorted at build time.
2012-04-19 15:06:55 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
PM / Freezer: Remove references to TIF_FREEZE in comments
2012-03-04 23:08:54 +01:00
futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()
2012-07-24 16:02:57 +02:00
futex: Mark get_robust_list as deprecated
2012-03-29 11:37:17 +02:00
userns: Convert in_group_p and in_egroup_p to use kgid_t
2012-05-03 03:29:33 -07:00
hrtimer: Update hrtimer base offsets each hrtimer_interrupt
2012-07-11 23:34:39 +02:00
hung task debugging: Inject NMI when hung and going to panic
2012-04-25 12:39:25 +02:00
irq_work: fix compile failure on tile from missing include
2012-04-13 13:15:16 -04:00
itimer: Use printk_once instead of WARN_ONCE
2012-04-10 11:00:30 +02:00
static keys: Inline the static_key_enabled() function
2012-02-28 20:01:08 +01:00
vsprintf: fix %ps on non symbols when using kallsyms
2012-05-29 16:22:32 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
locking: Adjust spin lock inlining Kconfig options
2012-09-13 17:56:13 +02:00
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
kdump: append newline to the last lien of vmcoreinfo note
2012-07-30 17:25:20 -07:00
[media] kernel:kfifo: export __kfifo_max_r symbol
2012-04-11 18:24:37 -03:00
kmod: avoid deadlock from recursive kmod call
2012-07-30 17:25:20 -07:00
kprobes/x86: Fix to support jprobes on ftrace-based kprobe
2012-09-13 22:52:11 -04:00
kthread: Implement park/unpark facility
2012-08-13 17:01:06 +02:00
brlocks/lglocks: turn into functions
2012-05-29 23:28:41 -04:00
lockdep: Check if nested lock is actually held
2012-09-13 17:00:44 +02:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:28:49 -07:00
Guard check in module loader against integer overflow
2012-05-23 22:28:53 +09:30
sched/rt: Use schedule_preempt_disabled()
2012-03-01 10:28:03 +01:00
padata: Fix cpu hotplug
2012-03-29 19:52:46 +08:00
panic: fix a possible deadlock in panic()
2012-07-30 17:25:13 -07:00
params: replace printk(KERN_<LVL>...) with pr_<lvl>(...)
2012-05-04 17:28:18 -07:00
net ip6 flowlabel: Make owner a union of struct pid * and kuid_t
2012-08-14 21:49:25 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
[S390] cputime: add sparse checking and cleanup
2011-12-15 14:56:19 +01:00
printk: Fix calculation of length used to discard records
2012-08-12 21:25:50 +03:00
userns: Convert ptrace, kill, set_priority permission checks to work with kuids and kgids
2012-05-03 03:28:51 -07:00
rcu: Allow nesting of rcu_idle_enter() and rcu_idle_exit()
2012-02-21 09:06:12 -08:00
rcu: Add PROVE_RCU_DELAY to provoke difficult races
2012-09-23 07:42:49 -07:00
rcu: Move TINY_RCU quiescent state out of extended quiescent state
2012-09-23 07:42:52 -07:00
rcu: Move TINY_PREEMPT_RCU away from raw_local_irq_save()
2012-09-23 07:42:51 -07:00
rcu: Prevent initialization race in rcutorture kthreads
2012-09-23 07:42:23 -07:00
rcu: Apply micro-optimization and int/bool fixes to RCU's idle handling
2012-09-26 15:47:18 +02:00
rcu: Ignore userspace extended quiescent state by default
2012-09-26 15:47:01 +02:00
rcu: Make RCU_FAST_NO_HZ handle adaptive ticks
2012-09-26 15:44:02 +02:00
Merge remote-tracking branch 'tip/smp/hotplug' into next.2012.09.25b
2012-09-25 10:01:45 -07:00
splice: fix racy pipe->buffers uses
2012-06-13 21:16:42 +02:00
rescounters: add res_counter_uncharge_until()
2012-05-29 16:22:27 -07:00
resource: make sure requested range is included in the root range
2012-07-30 17:25:21 -07:00
lockdep, rtmutex, bug: Show taint flags on error
2011-12-06 08:16:49 +01:00
rtmutex-tester: convert sysdev_class to a regular subsystem
2011-12-14 14:54:22 -08:00
Revert "rcu: Permit rt_mutex_unlock() with irqs disabled"
2011-12-11 10:33:18 -08:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
seccomp: fix build warnings when there is no CONFIG_SECCOMP_FILTER
2012-04-18 12:24:52 +10:00
semaphore: fix improper comment reference to mutex
2012-04-05 17:15:55 -07:00
task_work: Simplify the usage in ptrace_notify() and get_signal_to_deliver()
2012-09-13 16:47:37 +02:00
smp: Remove ipi_call_lock[_irq]()/ipi_call_unlock[_irq]()
2012-06-05 17:27:14 +02:00
hotplug: Fix UP bug in smpboot hotplug code
2012-08-13 17:01:07 +02:00
smpboot: Provide infrastructure for percpu hotplug threads
2012-08-13 17:01:07 +02:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:43:39 -07:00
locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage
2012-03-23 13:18:57 +01:00
workqueue: deprecate system_nrt[_freezable]_wq
2012-08-20 14:51:24 -07:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
kernel/sys.c: avoid argv_free(NULL)
2012-07-30 17:25:13 -07:00
syscalls, x86: add __NR_kcmp syscall
2012-05-31 17:49:32 -07:00
Linux support for the 64-bit ARM architecture (AArch64)
2012-10-01 11:51:57 -07:00
mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threads
2012-07-31 18:42:40 -07:00
task_work: task_work_add() should not succeed after exit_task_work()
2012-09-13 16:47:34 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
time: Remove bogus comments
2012-03-15 18:17:55 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:45:16 -07:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
userns: Convert taskstats to handle the user and pid namespaces.
2012-09-18 01:01:32 -07:00
userns: Convert setting and getting uid and gid system calls to use kuid and kgid
2012-05-03 03:28:41 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
userns: Use cred->user_ns instead of cred->user->user_ns
2012-04-07 16:55:51 -07:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
lockdep/waitqueues: Add better annotation
2011-12-21 10:07:39 +01:00
watchdog: Use hotplug thread infrastructure
2012-08-13 17:01:07 +02:00
Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2012-10-02 09:54:49 -07:00
aecdc33e11