David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-15 11:43:53 -04:00
..
debug	kernel/debug: Make use of KGDB_REASON_NMI	2012-07-31 08:16:43 -05:00
events	perf/hwpb: Invoke __perf_event_disable() if interrupts are already disabled	2012-09-04 17:29:53 +02:00
gcov
irq	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-08-03 10:56:44 -07:00
power	Revert "NMI watchdog: fix for lockup detector breakage on resume"	2012-08-08 20:49:45 +02:00
sched	sched: Fix kernel-doc warnings in kernel/sched/fair.c	2012-09-04 14:30:49 +02:00
time	sched: Add missing call to calc_load_exit_idle()	2012-09-04 14:30:29 +02:00
trace	tracing/syscalls: Fix perf syscall tracing when syscall_nr == -1	2012-08-17 15:19:46 -04:00
.gitignore
acct.c
async.c	[SCSI] async: make async_synchronize_full() flush all work regardless of domain	2012-07-20 09:07:37 +01:00
audit.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
audit.h
audit_tree.c	audit: clean up refcounting in audit-tree	2012-08-15 12:55:22 +02:00
audit_watch.c	get rid of kern_path_parent()	2012-07-14 16:35:02 +04:00
auditfilter.c
auditsc.c
backtracetest.c
bounds.c
capability.c	userns: Teach inode_capable to understand inodes whose uids map to other namespaces.	2012-05-15 14:59:24 -07:00
cgroup.c	Merge branch 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup	2012-07-24 17:47:44 -07:00
cgroup_freezer.c
compat.c	new helper: sigsuspend()	2012-05-21 23:52:30 -04:00
configs.c
cpu.c	mm/hotplug: correctly setup fallback zonelists when creating new pgdat	2012-07-31 18:42:44 -07:00
cpu_pm.c	kernel/cpu_pm.c: fix various typos	2012-05-31 17:49:27 -07:00
cpuset.c	cpusets: Remove/update outdated comments	2012-07-24 13:53:28 +02:00
crash_dump.c
cred.c	keys: kill task_struct->replacement_session_keyring	2012-05-23 22:11:41 -04:00
delayacct.c
dma.c
elfcore.c
exec_domain.c
exit.c	posix_types.h: Cleanup stale __NFDBITS and related definitions	2012-07-26 13:36:43 -07:00
extable.c
fork.c	uprobes: Fix mmap_region()'s mm->mm_rb corruption if uprobe_mmap() fails	2012-08-21 11:48:12 +02:00
freezer.c
futex.c	futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()	2012-07-24 16:02:57 +02:00
futex_compat.c
groups.c	userns: Convert in_group_p and in_egroup_p to use kgid_t	2012-05-03 03:29:33 -07:00
hrtimer.c	hrtimer: Update hrtimer base offsets each hrtimer_interrupt	2012-07-11 23:34:39 +02:00
hung_task.c
irq_work.c
itimer.c
jump_label.c
kallsyms.c	vsprintf: fix %ps on non symbols when using kallsyms	2012-05-29 16:22:32 -07:00
kcmp.c	syscalls, x86: add __NR_kcmp syscall	2012-05-31 17:49:32 -07:00
Kconfig.freezer
Kconfig.hz
Kconfig.locks
Kconfig.preempt
kexec.c	kdump: append newline to the last lien of vmcoreinfo note	2012-07-30 17:25:20 -07:00
kfifo.c
kmod.c	kmod: avoid deadlock from recursive kmod call	2012-07-30 17:25:20 -07:00
kprobes.c
ksysfs.c
kthread.c	kthread_worker: reimplement flush_kthread_work() to allow freeing the work item being executed	2012-07-22 10:15:28 -07:00
latencytop.c
lglock.c	brlocks/lglocks: turn into functions	2012-05-29 23:28:41 -04:00
lockdep.c
lockdep_internals.h
lockdep_proc.c
lockdep_states.h
Makefile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-06-01 10:34:35 -07:00
module.c	Guard check in module loader against integer overflow	2012-05-23 22:28:53 +09:30
mutex-debug.c
mutex-debug.h
mutex.c
mutex.h
notifier.c
nsproxy.c
padata.c
panic.c	panic: fix a possible deadlock in panic()	2012-07-30 17:25:13 -07:00
params.c	params: replace printk(KERN_<LVL>...) with pr_<lvl>(...)	2012-05-04 17:28:18 -07:00
pid.c	net ip6 flowlabel: Make owner a union of struct pid * and kuid_t	2012-08-14 21:49:25 -07:00
pid_namespace.c	pidns: Export free_pid_ns	2012-08-14 21:49:35 -07:00
posix-cpu-timers.c
posix-timers.c
printk.c	printk: Fix calculation of length used to discard records	2012-08-12 21:25:50 +03:00
profile.c
ptrace.c	userns: Convert ptrace, kill, set_priority permission checks to work with kuids and kgids	2012-05-03 03:28:51 -07:00
range.c
rcu.h
rcupdate.c	rcu: Consolidate tree/tiny __rcu_read_{,un}lock() implementations	2012-07-02 12:34:23 -07:00
rcutiny.c	rcu: Fix rcu_is_cpu_idle() #ifdef in TINY_RCU	2012-07-02 12:34:25 -07:00
rcutiny_plugin.h	rcu: Fix code-style issues involving "else"	2012-07-06 06:01:48 -07:00
rcutorture.c	rcu: Fix broken strings in RCU's source code.	2012-07-06 06:01:49 -07:00
rcutree.c	rcu: Fix code-style issues involving "else"	2012-07-06 06:01:48 -07:00
rcutree.h	Merge branches 'bigrtm.2012.07.04a', 'doctorture.2012.07.02a', 'fixes.2012.07.06a' and 'fnh.2012.07.02a' into HEAD	2012-07-06 05:59:30 -07:00
rcutree_plugin.h	rcu: Fix code-style issues involving "else"	2012-07-06 06:01:48 -07:00
rcutree_trace.c	rcu: Fix broken strings in RCU's source code.	2012-07-06 06:01:49 -07:00
relay.c	splice: fix racy pipe->buffers uses	2012-06-13 21:16:42 +02:00
res_counter.c	rescounters: add res_counter_uncharge_until()	2012-05-29 16:22:27 -07:00
resource.c	resource: make sure requested range is included in the root range	2012-07-30 17:25:21 -07:00
rtmutex-debug.c
rtmutex-debug.h
rtmutex-tester.c
rtmutex.c
rtmutex.h
rtmutex_common.h
rwsem.c
seccomp.c
semaphore.c
signal.c	signal: make sure we don't get stopped with pending task_work	2012-07-22 23:57:54 +04:00
smp.c	smp: Remove ipi_call_lock[_irq]()/ipi_call_unlock[_irq]()	2012-06-05 17:27:14 +02:00
smpboot.c	smpboot, idle: Fix comment mismatch over idle_threads_init()	2012-05-24 22:58:08 +02:00
smpboot.h	smpboot: Remove leftover declaration	2012-06-11 15:07:52 +02:00
softirq.c	mm: allow PF_MEMALLOC from softirq context	2012-07-31 18:42:45 -07:00
spinlock.c
srcu.c	rcu: Implement per-domain single-threaded call_srcu() state machine	2012-04-30 10:48:25 -07:00
stacktrace.c
stop_machine.c
sys.c	kernel/sys.c: avoid argv_free(NULL)	2012-07-30 17:25:13 -07:00
sys_ni.c	syscalls, x86: add __NR_kcmp syscall	2012-05-31 17:49:32 -07:00
sysctl.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-08-01 10:26:23 -07:00
sysctl_binary.c	mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threads	2012-07-31 18:42:40 -07:00
task_work.c	task_work: add a scheduling point in task_work_run()	2012-08-21 09:11:44 -07:00
taskstats.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
test_kprobes.c
time.c
timeconst.pl
timer.c	alpha: take a bunch of syscalls into osf_sys.c	2012-08-19 08:41:19 -07:00
tracepoint.c
tsacct.c
uid16.c	userns: Convert setting and getting uid and gid system calls to use kuid and kgid	2012-05-03 03:28:41 -07:00
up.c
user-return-notifier.c
user.c	userns: Silence silly gcc warning.	2012-05-19 15:44:40 -06:00
user_namespace.c	userns: Store uid and gid values in struct cred with kuid_t and kgid_t types	2012-05-03 03:28:38 -07:00
utsname.c
utsname_sysctl.c
wait.c
watchdog.c	Revert "NMI watchdog: fix for lockup detector breakage on resume"	2012-08-08 20:49:45 +02:00
workqueue.c	workqueue: fix possible idle worker depletion across CPU hotplug	2012-09-10 10:05:54 -07:00
workqueue_sched.h