Linus Torvalds
3556485f15
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ...
Pull security subsystem updates for 3.4 from James Morris:
"The main addition here is the new Yama security module from Kees Cook,
which was discussed at the Linux Security Summit last year. Its
purpose is to collect miscellaneous DAC security enhancements in one
place. This also marks a departure in policy for LSM modules, which
were previously limited to being standalone access control systems.
Chromium OS is using Yama, and I believe there are plans for Ubuntu,
at least.
This patchset also includes maintenance updates for AppArmor, TOMOYO
and others."
Fix trivial conflict in <net/sock.h> due to the jumo_label->static_key
rename.
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)
AppArmor: Fix location of const qualifier on generated string tables
TOMOYO: Return error if fails to delete a domain
AppArmor: add const qualifiers to string arrays
AppArmor: Add ability to load extended policy
TOMOYO: Return appropriate value to poll().
AppArmor: Move path failure information into aa_get_name and rename
AppArmor: Update dfa matching routines.
AppArmor: Minor cleanup of d_namespace_path to consolidate error handling
AppArmor: Retrieve the dentry_path for error reporting when path lookup fails
AppArmor: Add const qualifiers to generated string tables
AppArmor: Fix oops in policy unpack auditing
AppArmor: Fix error returned when a path lookup is disconnected
KEYS: testing wrong bit for KEY_FLAG_REVOKED
TOMOYO: Fix mount flags checking order.
security: fix ima kconfig warning
AppArmor: Fix the error case for chroot relative path name lookup
AppArmor: fix mapping of META_READ to audit and quiet flags
AppArmor: Fix underflow in xindex calculation
AppArmor: Fix dropping of allowed operations that are force audited
AppArmor: Add mising end of structure test to caps unpacking
...
2012-03-21 13:25:04 -07:00
Power management updates for 3.4
2012-03-21 10:15:51 -07:00
Documentation: update cgroupfs mount point
2011-06-15 21:52:50 -07:00
acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec
2012-01-18 01:14:17 -05:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
Documentation: drop as block elevator reference in switching-sched.txt
2011-11-04 12:01:48 -07:00
cciss: auto engage SCSI mid layer at driver load time
2011-11-16 09:21:49 +01:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
Documentation/: it's -> its where appropriate
2010-04-23 02:09:52 +02:00
Doc: cpufreq: Fix typo and outdated line
2011-11-08 10:23:29 +01:00
Documentation: Update stable address
2011-12-12 14:14:31 -08:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
regulator: Updates for 3.4
2012-03-21 10:34:56 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
Merge remote-tracking branches 'regulator/topic/devm' and 'regulator/topic/stub' into regulator-next
2012-03-18 21:38:28 +00:00
[media] dvb_get_firmware: updates for it913x
2011-12-11 09:00:48 -02:00
fault-injection: update documentation with the mmc module param
2011-10-26 16:32:13 -04:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
firmware: Update hotplug script
2010-08-05 13:53:34 -07:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
HID: Move hiddev.txt to the new Documentation/hid directory
2011-03-22 11:43:51 +01:00
hwmon changes for v3.4
2012-03-21 10:37:25 -07:00
USB: ohci-nxp: Rename symbols from pnx4008 to nxp
2012-03-13 14:27:28 -07:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-07-25 23:06:24 -07:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
[S390] Add s390x description to Documentation/kdump/kdump.txt
2011-12-27 11:27:13 +01:00
driver-core: documentation: fix up Greg's email address
2012-02-15 14:48:01 -08:00
Documentation: thinkpad-acpi grammo fixes
2011-11-04 12:01:47 -07:00
Documentation: fix leds-class.txt duplicated word
2011-11-04 12:01:48 -07:00
Documentation: add pointer to name_to_dev_t for root= values
2011-08-03 14:25:21 -10:00
kbuild: introduce HDR_ARCH_LIST for headers_install_all
2010-12-14 22:16:19 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
mmc: core: Fixup delayed work clock gating patch
2012-01-11 23:58:43 -05:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
Documentation/: it's -> its where appropriate
2010-04-23 02:09:52 +02:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
NFC: Driver for NXP Semiconductors PN544 NFC chip.
2011-01-13 08:03:19 -08:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
pcmcia: use autoconfiguration feature for ioports and iomem
2010-09-29 17:20:24 +02:00
PM / Freezer / Docs: Document the beauty of freeze/thaw semantics
2012-02-09 23:55:49 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
pps: add parallel port PPS signal generator
2011-01-13 08:03:21 -08:00
Kernel documentation for the PTI feature.
2011-05-13 16:31:00 -07:00
ptp: Added a brand new class driver for ptp clocks.
2011-05-23 13:01:00 -07:00
RapidIO: documentation update
2011-11-02 16:07:02 -07:00
rcu: Call out dangers of expedited RCU primitives
2012-02-21 09:06:08 -08:00
[S390] Remove Kerntypes leftovers
2011-12-27 11:27:12 +01:00
sched: Remove sched_switch
2012-01-27 13:28:53 +01:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-03-21 13:25:04 -07:00
serial/documentation: fix documented name of DCD cpp symbol
2012-01-04 16:26:32 -08:00
sh: clkfwk: Kill off unused clk_set_rate_ex().
2010-11-15 18:25:12 +09:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
spi: create a message queueing infrastructure
2012-03-07 19:19:48 -07:00
Documentation: add missing tainted bits to Documentation/sysctl/kernel.txt
2012-02-06 16:29:19 -08:00
Documentation: Fix typo in tcm_mod_builder.py
2012-02-10 09:52:18 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
Documentation: Fix Broken URL "freshmeat"
2012-02-21 11:43:45 +01:00
Document the vDSO and add a reference parser
2011-07-14 17:57:09 -07:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Documentation: Fix typo in watchdog-kernel-api.txt
2012-02-21 11:40:34 +01:00
x86-64, doc: Remove int 0xcc from entry_64.S documentation
2011-08-16 08:04:08 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
add random binaries to .gitignore
2010-04-08 11:34:34 +02:00
Documentation: Fix broken URL "JF"
2012-02-21 11:44:14 +01:00
doc: Add load/store guarantees to Documentation/atomic-ops.txt
2011-12-11 10:31:58 -08:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
mm: convert mm->cpu_vm_cpumask into cpumask_var_t
2011-05-25 08:39:21 -07:00
Documentation/Changes: remove some really obsolete text
2011-07-11 16:48:38 -07:00
Document Linux's circular buffering capabilities
2010-03-24 16:31:22 -07:00
coccinelle.txt: update documentation to include M= option
2012-01-14 22:25:56 +01:00
Documentation: update CodingStyle use of braces
2011-11-04 12:01:47 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
topology/sysfs: Provide book id and siblings attributes
2010-09-09 20:41:25 +02:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
crypto: digital signature verification support
2011-11-09 12:10:37 +02:00
Documentation/DMA-API-HOWTO.txt: fix misleading example
2011-07-26 16:49:45 -07:00
include/linux/dma-mapping.h: add dma_zalloc_coherent()
2011-11-02 16:07:02 -07:00
dma-buf: Documentation update for Kconfig select
2012-01-13 10:27:33 +00:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
[S390] Remove Kerntypes leftovers
2011-12-27 11:27:12 +01:00
dynamic_debug: process multiple debug-queries on a line
2012-01-24 12:50:36 -08:00
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
Documentation: email-clients: Add better Thunderbird information
2011-08-13 18:34:03 -07:00
Merge branch 'kmap_atomic' of git://github.com/congwang/linux
2012-03-21 09:40:26 -07:00
flex_array: flex_array_prealloc takes a number of elements, not an end
2011-04-28 16:12:47 -04:00
Revert "gpiolib: annotate gpio-intialization with __must_check"
2011-01-13 17:26:46 -08:00
Documentation: Update stable address
2011-12-12 14:14:31 -08:00
hwspinlock/core: register a bank of hwspinlocks in a single API call
2011-09-21 19:45:34 +03:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
Documentation/iostats.txt: bit-size reference etc.
2011-03-23 20:44:18 +01:00
IPMI: Add the document description of ipmi_get_smi_info
2010-12-14 00:22:00 -05:00
bitmap, irq: add smp_affinity_list interface to /proc/irq
2011-05-25 08:39:45 -07:00
irq_domain: add documentation and MAINTAINERS entry.
2012-02-14 14:06:47 -07:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
docbook: warn on unused doc entries
2010-09-11 16:49:21 -07:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
kmemleak: Handle percpu memory allocation
2011-12-02 16:12:42 +00:00
driver-core: documentation: fix up Greg's email address
2012-02-15 14:48:01 -08:00
tree-wide: fix comment/printk typos
2010-11-01 15:38:34 -04:00
kref: Fix typo in kref documentation
2011-03-07 13:20:05 -08:00
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
lockdep: Update documentation for lock-class leak detection
2011-12-11 10:31:23 -08:00
Documentation: Add statistics about nested locks
2011-05-28 17:03:29 +02:00
watchdog: Update documentation
2012-02-11 15:11:28 +01:00
drivers/net: fix up stale paths from driver reorg
2012-01-30 12:54:40 -05:00
[media] Remove the old V4L1 v4lgrab.c file
2010-12-29 08:17:12 -02:00
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
md: create externally visible flags for supporting hot-replace.
2011-12-23 10:17:51 +11:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
memory hotplug: Allow memory blocks to span multiple memory sections
2011-02-03 16:08:57 -08:00
mutex: Fix annotations to include it in kernel-locking docbook
2010-09-03 08:19:51 +02:00
Doc: Update numastat.txt
2012-02-28 16:05:06 +01:00
module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
2011-11-07 07:54:42 +10:30
Documentation/padata.txt: fix typos etc.
2010-08-11 08:59:18 -07:00
pinctrl: fix some pinmux typos
2012-01-26 14:11:31 +01:00
Documentation: update printk-formats.txt
2011-06-15 21:52:50 -07:00
Documentation: add Ramoops usage description
2011-08-13 18:34:03 -07:00
Documentation: Update augmented rbtree documentation
2011-07-24 10:03:05 -07:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
variable name fix to Documentation/rt-mutex-design.txt
2010-06-05 17:39:09 +02:00
RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer
2011-03-09 11:25:10 -08:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
update email address
2010-07-19 10:56:54 +02:00
Documentation/spinlocks.txt: Remove reference to sti()/cli()
2011-07-11 12:45:04 -07:00
doc: stable_api_nonsense.txt: fix paragraph to make more sense.
2011-03-30 12:02:05 +02:00
stable: update documentation to ask for kernel version
2012-01-24 10:50:22 -08:00
static keys: Add docs better explaining the whole 'struct static_key' mechanism
2012-02-24 09:12:19 +01:00
Documentation/SubmitChecklist: add RCU debug config options
2011-07-25 20:57:17 -07:00
Documentation: SubmittingDrivers: fix Linus's git tree URL
2011-08-13 18:34:03 -07:00
Documentation: fix spelling error in SubmittingPatches
2011-08-13 18:34:02 -07:00
Fix typos in comments
2010-03-16 11:47:56 +01:00
documentation: update sysrq.txt magic sysrq keys
2010-10-26 17:32:41 -07:00
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
Documentation/volatile-considered-harmful.txt: correct cpu_relax() documentation
2010-03-24 16:31:20 -07:00
workqueue: Document debugging tricks
2011-03-31 13:40:42 +02:00
decompressors: add XZ decompressor module
2011-01-13 08:03:24 -08:00
3556485f15
