Linus Torvalds
f429ee3b80
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit ...
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit: (29 commits)
audit: no leading space in audit_log_d_path prefix
audit: treat s_id as an untrusted string
audit: fix signedness bug in audit_log_execve_info()
audit: comparison on interprocess fields
audit: implement all object interfield comparisons
audit: allow interfield comparison between gid and ogid
audit: complex interfield comparison helper
audit: allow interfield comparison in audit rules
Kernel: Audit Support For The ARM Platform
audit: do not call audit_getname on error
audit: only allow tasks to set their loginuid if it is -1
audit: remove task argument to audit_set_loginuid
audit: allow audit matching on inode gid
audit: allow matching on obj_uid
audit: remove audit_finish_fork as it can't be called
audit: reject entry,always rules
audit: inline audit_free to simplify the look of generic code
audit: drop audit_set_macxattr as it doesn't do anything
audit: inline checks for not needing to collect aux records
audit: drop some potentially inadvisable likely notations
...
Use evil merge to fix up grammar mistakes in Kconfig file.
Bad speling and horrible grammar (and copious swearing) is to be
expected, but let's keep it to commit messages and comments, rather than
expose it to users in config help texts or printouts.
2012-01-17 16:41:31 -08:00
sh: nommu: use 32-bit phys mode.
2010-11-04 12:32:24 +09:00
sh: Split out the unaligned counters and user bits.
2010-01-12 16:12:25 +09:00
kbuild: move asm-offsets.h to include/generated
2009-12-12 13:08:14 +01:00
sh: consolidate atomic_cmpxchg()/atomic_add_unless() definitions.
2010-01-08 17:02:17 +09:00
sh: Make the atomic functions safe for irqsoff tracing
2009-06-15 00:31:17 +09:00
sh: consolidate atomic_cmpxchg()/atomic_add_unless() definitions.
2010-01-08 17:02:17 +09:00
atomic: cleanup asm-generic atomic*.h inclusion
2011-07-26 16:49:47 -07:00
sh: Convert to generic bitops for IRQ-toggling implementation.
2008-12-22 18:42:53 +09:00
sh: Relax inline assembly constraints
2009-01-29 11:57:09 +09:00
sh: Provide optimized non-atomic bitops for SH-2A.
2008-12-22 18:42:54 +09:00
bitops: remove minix bitops from asm/bitops.h
2011-03-23 19:46:22 -07:00
asm-generic: introduce asm/bitsperlong.h
2009-06-11 21:02:14 +02:00
panic: Allow warnings to set different taint flags
2010-05-19 08:36:48 +01:00
sh: Idle loop chainsawing for SMP-based light sleep.
2009-10-16 17:20:58 +09:00
byteorder: make swab.h include asm/swab.h like a regular header
2009-01-14 19:56:50 -08:00
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
2010-06-01 08:55:52 -07:00
sh: fix sys_cacheflush error checking
2009-08-24 18:59:09 +09:00
sh: Assume new page cache pages have dirty dcache lines.
2010-12-01 15:39:51 +09:00
sh: Convert sh64 to use the generic checksum code.
2009-06-15 00:00:42 +09:00
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
sh: move sh clock.c contents to drivers/sh/clk.
2010-05-13 17:39:14 +09:00
sh: Fix up xchg/cmpxchg corruption with gUSA RB.
2011-06-08 15:22:39 +09:00
sh: Fix sh4a llsc-based cmpxchg()
2009-06-11 09:31:55 +03:00
sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores.
2009-03-17 17:49:49 +09:00
sh: Convert to asm-generic/current.h.
2009-06-14 21:34:26 +09:00
asm-generic: move archictures to common delay.h
2011-07-22 18:46:24 +02:00
sh: hwblk: Kill off hwblk_id from pdev archdata.
2011-11-18 16:24:08 +09:00
dma-mapping: remove dma_is_consistent API
2010-08-11 08:59:21 -07:00
dmaengine: shdma: separate DMA headers.
2010-03-02 11:09:04 +09:00
dmaengine: shdma: separate DMA headers.
2010-03-02 11:09:04 +09:00
sh: dma - convert sysdev_class to a regular subsystem
2011-12-21 15:09:52 -08:00
sh: Optimise FDE/CIE lookup by using red-black trees
2010-02-08 11:29:15 +09:00
sh: update the FDPIC relocations.
2010-06-14 18:02:13 +09:00
sh: Remove implicit sign extension from assembler immediates
2009-08-24 17:09:53 +09:00
sh: fix up an off-by-1 in the number of early ioremap fixmaps.
2010-06-21 16:23:03 +09:00
flat: fix data sections alignment
2009-05-29 08:40:02 -07:00
sh: Move over to dynamically allocated FPU context.
2010-01-13 12:51:40 +09:00
sh: Provide CALLER_ADDRx definitions even when ftrace is disabled.
2009-10-14 11:49:49 +09:00
futex: Sanitize futex ops argument types
2011-03-11 12:23:31 +01:00
futex: Sanitize futex ops argument types
2011-03-11 12:23:31 +01:00
sh: Allow GPIO chips to register IRQ mappings.
2010-10-03 03:55:39 +09:00
sh: Count NMIs in irq_cpustat_t.
2009-10-14 16:42:28 +09:00
sh: mach-hp6xx: Fix up the hp6xx build for hd64461 changes.
2009-05-20 11:27:13 +09:00
sh: Prevent heartbeat from scribbling over non-LED bits.
2009-08-18 21:16:29 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2010-05-19 11:36:03 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
sh: Fix up legacy PTEA space attribute mapping.
2011-01-11 15:02:59 +09:00
sh: machvec IO death.
2010-11-01 09:49:04 -04:00
tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys
2011-02-17 14:16:30 -08:00
sh: Convert ipc/shm bits to their asm-generic versions.
2009-06-14 23:20:27 +09:00
sh: modify NR_IRQS from 256 to 512
2010-07-06 17:37:32 +09:00
Fix IRQ flag handling naming
2010-10-07 14:08:55 +01:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2010-08-16 13:32:24 +09:00
sh: hw-breakpoints: Add preliminary support for SH-4A UBC.
2009-12-08 15:02:27 +09:00
sh: convert kexec crash kernel management to LMB.
2010-05-07 14:54:55 +09:00
kgdbts: unify/generalize gdb breakpoint adjustment
2011-05-26 17:12:36 -07:00
kmap_types: make most arches use generic header file
2009-06-16 19:47:51 -07:00
sh: Add kprobe-based event tracer.
2010-06-14 15:16:53 +09:00
arch: Implement local64_t
2010-06-09 11:12:36 +02:00
sh: Add a machvec callback for early memblock reservations.
2011-01-11 13:04:57 +09:00
sh: Switch to asm-generic versions for identical headers.
2009-06-14 23:26:48 +09:00
sh: Fix up NUMA build for 29-bit.
2010-03-10 16:29:48 +09:00
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
2010-01-26 12:58:40 +09:00
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
2010-01-26 12:58:40 +09:00
Fix node_start/end_pfn() definition for mm/page_cgroup.c
2011-06-27 14:13:09 -07:00
sh: Optimise FDE/CIE lookup by using red-black trees
2010-02-08 11:29:15 +09:00
sh: Convert ipc/shm bits to their asm-generic versions.
2009-06-14 23:20:27 +09:00
sh: Fix up T-bit error handling in SH-4A mutex fastpath.
2009-01-29 11:56:03 +09:00
sh: Add SH-4A optimized fastpath mutex implementation.
2008-12-22 18:42:55 +09:00
sh: Fix cached/uncaced address calculation in 29bit mode
2011-11-04 22:13:50 +09:00
sh: Switch to asm-generic versions for identical headers.
2009-06-14 23:26:48 +09:00
sh: Switch to asm-generic versions for identical headers.
2009-06-14 23:26:48 +09:00
PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.
2011-07-22 08:26:06 -07:00
irq_work: Add generic hardirq context callbacks
2010-10-18 19:58:50 +02:00
sh: default to extended TLB support.
2010-01-13 19:11:14 +09:00
sh: Rename split-level pgtable headers.
2010-01-13 19:18:39 +09:00
sh: Rename split-level pgtable headers.
2010-01-13 19:18:39 +09:00
sh64: asm/pgtable.h needs asm/mmu.h
2011-05-31 14:37:44 +09:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2010-10-28 12:06:51 -07:00
sh: Convert to asm-generic/posix_types.h.
2009-06-14 23:16:27 +09:00
sh: Convert to asm-generic/posix_types.h.
2009-06-14 23:16:27 +09:00
sh: sh7372 SH4AL-DSP probe support
2011-01-13 15:20:40 +09:00
sh: constify prefetch pointers.
2011-01-11 14:39:35 +09:00
sh, exec: remove redundant set_fs(USER_DS)
2011-06-14 15:15:58 +09:00
sh: Fix conflicting definitions of ptrace_triggered
2011-08-03 12:37:22 +09:00
Audit: push audit success and retcode into arch ptrace.h
2012-01-17 16:16:56 -05:00
Audit: push audit success and retcode into arch ptrace.h
2012-01-17 16:16:56 -05:00
sh: machine_ops based reboot support.
2010-01-20 16:42:52 +09:00
sh: add romimage-macros.h
2009-09-11 13:19:16 +09:00
sh: rtc-generic support.
2009-04-27 17:34:39 +09:00
rwsem: Move duplicate function prototypes to linux/rwsem.h
2011-01-27 12:30:39 +01:00
remove needless ISA_DMA_THRESHOLD
2010-08-07 18:15:50 +02:00
sh: seccomp support.
2008-08-02 04:39:32 +09:00
sh: Change __nosave_XXX symbols to long
2011-02-15 16:24:54 +09:00
sh: Convert ipc/shm bits to their asm-generic versions.
2009-06-14 23:20:27 +09:00
sh: Switch to asm-generic versions for identical headers.
2009-06-14 23:26:48 +09:00
sh: bootmem refactoring.
2010-05-11 13:32:19 +09:00
sh: Kill off more unused sh_bios callbacks.
2010-01-12 15:26:11 +09:00
sh: Convert ipc/shm bits to their asm-generic versions.
2009-06-14 23:20:27 +09:00
sh: Convert to asm-generic/signal.h.
2009-06-14 23:25:57 +09:00
sh: define DMA slaves per CPU type, remove now redundant header
2010-05-22 16:51:17 +09:00
sh: Conver to asm-generic/sizes.h.
2011-03-22 22:43:09 +09:00
sh: CPU hotplug support.
2010-04-26 19:08:55 +09:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
sh: Switch to asm-generic versions for identical headers.
2009-06-14 23:26:48 +09:00
locking: Convert raw_rwlock functions to arch_rwlock
2009-12-14 23:55:32 +01:00
locking: Convert raw_rwlock to arch_rwlock
2009-12-14 23:55:32 +01:00
sh: Provide a generic SRAM pool for tiny memories.
2010-10-15 02:09:00 +09:00
sh: remove warning and warning_symbol from struct stacktrace_ops
2011-05-23 14:42:15 +09:00
sh: Add SH-5 optimized memcpy()/memset()/strcpy()/strlen().
2008-12-22 18:44:05 +09:00
PM / Hibernate: Remove arch_prepare_suspend()
2011-05-24 23:35:55 +02:00
sh: Tidy up duplication in irq/swab/timex.h.
2009-06-14 23:21:54 +09:00
tracing: Unify arch_syscall_addr() implementations
2010-02-17 13:07:21 +01:00
sh: Add ftrace syscall tracing support
2009-07-06 20:16:33 +09:00
sh: Fix up spurious syscall restarting.
2009-01-29 11:56:03 +09:00
Add generic sys_olduname()
2010-03-12 15:52:32 -08:00
SH: Add missing consts to sys_execve() declaration
2010-10-07 14:08:52 +01:00
Mark arguments to certain syscalls as being const
2010-08-13 16:53:13 -07:00
sh: nommu: Support building without an uncached mapping.
2010-11-04 12:46:19 +09:00
sh: nommu: Support building without an uncached mapping.
2010-11-04 12:46:19 +09:00
sh: nommu: Support building without an uncached mapping.
2010-11-04 12:46:19 +09:00
sh: Convert to asm-generic/termbits.h and termios.h.
2009-06-14 23:17:57 +09:00
sh: Convert to asm-generic/termbits.h and termios.h.
2009-06-14 23:17:57 +09:00
freezer: remove now unused TIF_FREEZE
2011-11-21 12:32:25 -08:00
sh: Only provide a PCLK definition for legacy CPG CPUs.
2009-12-29 11:09:30 +09:00
sh: asm/tlb.h needs linux/swap.h
2011-05-31 13:27:41 +09:00
sh: Fix up broken kerneldoc comments.
2008-08-04 12:51:06 +09:00
sh: Provide a global TLB flush for U/I-TLB clear.
2010-07-02 15:44:09 +09:00
sh: Fix up cpumask_of_pcibus() for the NUMA build.
2010-03-02 15:54:47 +09:00
sh: Add register alignment helpers for shared flushers.
2009-08-15 01:57:36 +09:00
sh: sh_ksyms_64 needs __strncpy_from_user() definition.
2008-09-29 19:45:16 +09:00
sh: Switch to asm-generic versions for identical headers.
2009-06-14 23:26:48 +09:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
sh: Convert to asm-generic/unaligned.h.
2009-06-14 23:24:43 +09:00
sh: nommu: Support building without an uncached mapping.
2010-11-04 12:46:19 +09:00
sh: Wire up process_vm syscalls.
2011-11-11 10:58:16 +09:00
sh: Wire up process_vm syscalls.
2011-11-11 10:58:16 +09:00
sh: unwinder: Introduce UNWINDER_BUG() and UNWINDER_BUG_ON()
2009-08-21 13:02:44 +01:00
sh64: fix up memory offset calculation.
2010-02-12 15:41:45 +09:00
sh: Mass ctrl_in/outX to __raw_read/writeX conversion.
2010-01-26 12:58:40 +09:00
f429ee3b80