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
SPI changes for v3.4.
2012-03-21 10:32:00 -07:00
bcma: add support for on-chip OTP memory used for SPROM storage
2012-03-06 15:16:18 -05:00
can: dev: let can_get_echo_skb() return dlc of CAN frame
2012-02-03 01:21:25 +01:00
mfd: twl-core: regulator configuration for twl6030 V1V8, V2V1 SMPS
2012-03-11 20:09:26 +00:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
2012-03-18 21:38:20 +00:00
InfiniBand/RDMA changes for the 3.4 merge window. Nothing big really
2012-03-21 10:33:42 -07:00
mmc: dw_mmc: Fix PIO mode with support of highmem
2012-02-13 20:39:05 -05:00
- Fix a regression in 16-bit Atmel NAND flash which was introduced in 3.1
2012-02-04 07:17:47 -08:00
netfilter: xt_CT: allow to attach timeout policy + glue code
2012-03-07 17:41:28 +01:00
netfilter: ebtables: fix alignment problem in ppc
2012-02-21 13:29:06 +01:00
netfilter: remove ipt_SAME.h and ipt_realm.h
2012-03-07 17:40:56 +01:00
netfilter: merge ipt_LOG and ip6_LOG into xt_LOG
2012-03-07 17:40:49 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
Merge remote-tracking branch 'regulator/topic/supply' into regulator-next
2012-03-18 21:39:19 +00:00
spi: sh-hspi: control spi clock more correctly
2012-03-15 03:41:01 -06:00
ssb: add some missing sprom attributes
2012-03-05 15:20:49 -05:00
Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux
2012-01-14 12:26:41 -08:00
USB: EHCI: Add a generic platform device driver
2012-03-15 12:42:07 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-01-18 15:51:48 -08:00
ACPI: Export interfaces for ioremapping/iounmapping ACPI registers
2012-01-17 04:35:20 -05:00
ahci: platform support for suspend/resume
2012-01-08 19:14:59 -05:00
tty: serial: altera_uart: remove early_altera_uart_setup
2012-02-09 09:04:23 -08:00
audit: comparison on interprocess fields
2012-01-17 16:17:03 -05:00
exec: fix use-after-free bug in setup_new_exec()
2012-02-06 15:15:20 -08:00
fs: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:21 +08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-02-18 15:24:05 -08:00
block: strip out locking optimization in put_io_context()
2012-02-07 07:51:30 +01:00
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
cdrom: move shared static to cdrom_device_info
2012-02-08 20:03:14 +01:00
cgroup: remove cgroup_subsys argument from callbacks
2012-02-02 09:20:22 -08:00
clocksource: Get rid of clocksource_calc_mult_shift()
2012-02-01 18:37:39 -08:00
Fix autofs compile without CONFIG_COMPAT
2012-02-26 09:44:55 -08:00
kernel.h: add BUILD_BUG() macro
2012-01-10 16:30:42 -08:00
compiler.h: Fix typo
2012-02-28 16:02:54 +01:00
drivers: hv: kvp: Add/cleanup connector defines
2012-02-02 15:30:47 -08:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86 parts
2012-01-26 16:49:08 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-01-18 15:51:48 -08:00
include/linux/crash_dump.h needs elf.h
2012-01-12 20:13:11 -08:00
crypto: Add bulk algorithm registration interface
2012-01-26 13:35:49 +11:00
vfs: move dentry_cmp from <linux/dcache.h> to fs/dcache.c
2012-03-04 15:51:42 -08:00
dccp: fix bug in sequence number validation during connection setup
2012-03-03 09:02:52 -07:00
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-01-08 12:19:57 -08:00
PM / devfreq: add relation of recommended frequency.
2012-03-17 21:51:34 +01:00
USB merge for 3.4-rc1
2012-03-20 11:26:30 -07:00
digsig: changed type of the timestamp
2012-02-20 19:46:36 +11:00
dynamic_debug: reduce lineno field to a saner 18 bits
2012-01-24 12:48:54 -08:00
block: don't call elevator callbacks for plug merges
2012-02-08 09:19:42 +01:00
drivercore: Add driver probe deferral mechanism
2012-03-08 11:53:13 -08:00
rename dev_hw_addr_random and remove redundant second
2012-02-13 00:46:41 -05:00
ethtool, mdio, mii: Specify MDIO information fields in struct ethtool_cmd
2012-03-01 16:41:26 -05:00
epoll: limit paths
2012-01-12 20:13:04 -08:00
PM / Hibernate: Fix s2disk regression related to freezing workqueues
2012-01-29 20:35:52 +01:00
vfs: Provide function to get superblock and wait for it to thaw
2012-02-13 20:45:38 -05:00
ftrace, perf: Add filter support for function trace event
2012-02-21 11:08:30 -05:00
ftrace: Allow to specify filter field type for ftrace events
2012-02-21 11:08:29 -05:00
block: Fix NULL pointer dereference in sd_revalidate_disk
2012-03-02 10:38:33 +01:00
mm: try to distribute dirty pages fairly across zones
2012-01-10 16:30:43 -08:00
GFS2: dlm based recovery coordination
2012-01-11 09:23:05 +00:00
Input: gpio_keys - fix struct device declared inside parameter list
2012-02-01 09:13:11 -08:00
Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus
2012-01-09 11:24:59 +01:00
highmem: kill all __kmap_atomic()
2012-03-20 21:48:30 +08:00
thp: add tlb_remove_pmd_tlb_entry
2012-01-12 20:13:08 -08:00
Tools: hv: Support enumeration from all the pools
2012-03-16 13:36:04 -07:00
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
net: Add framework to allow sending packets with customized CRC.
2012-02-24 01:37:35 -08:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
team: send only changed options/ports via netlink
2012-01-24 15:51:00 -05:00
if_vlan: Remove VLAN_ETH_ALEN define and the 1 use of it
2012-03-19 16:53:08 -04:00
ipv4: Implement IP_UNICAST_IF socket option.
2012-02-08 15:52:45 -05:00
ipv6: Implement IPV6_UNICAST_IF socket option.
2012-02-08 15:52:45 -05:00
inet_diag: Rename inet_diag_req_compat into inet_diag_req
2012-01-11 12:56:06 -08:00
arp: allow arp processing to honor per interface arp_accept sysctl
2012-03-16 23:00:20 -07:00
module_param: make bool parameters really bool (core code)
2012-01-13 09:32:18 +10:30
sched: Make initial SCHED_RR timeslace DEF_TIMESLICE
2012-02-22 12:28:29 +01:00
tracing/softirq: Move __raise_softirq_irqoff() out of header
2012-02-03 09:48:19 -05:00
block: exit_io_context() should call elevator_exit_icq_fn()
2012-02-15 09:45:53 +01:00
Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
2012-01-09 13:06:28 +01:00
net: implement IP_RECVTOS for IP_PKTOPTIONS
2012-02-13 00:46:41 -05:00
irq_domain: Centralize definition of irq_dispose_mapping()
2012-02-26 16:48:06 -07:00
ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>
2012-03-04 20:41:38 -05:00
jbd: Remove j_barrier mutex
2012-01-09 13:52:09 +01:00
static keys: Inline the static_key_enabled() function
2012-02-28 20:01:08 +01:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
sched/x86: Fix overflow in cyc2ns_offset
2012-03-13 16:27:51 +01:00
kdump: define KEXEC_NOTE_BYTES arch specific for s390x
2012-01-23 08:38:48 -08:00
Merge branch 'next-queue' into next
2012-02-09 17:02:34 +11:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
kmsg_dump: don't run on non-error paths by default
2012-03-05 15:49:42 -08:00
Fix compile breakage with kref.h
2012-01-17 15:40:51 -08:00
leds: add driver for TCA6507 LED controller
2012-01-10 16:30:49 -08:00
include/linux/linkage.h: remove unused ATTRIB_NORET macro
2012-01-12 20:13:03 -08:00
include/linux/lp8727.h: Remove executable bit
2012-02-02 15:43:40 -08:00
math: Introduce div64_long
2012-03-15 21:41:34 +01:00
mdio.h: Include linux/types.h
2012-03-03 15:04:45 -05:00
memcg: fix GPF when cgroup removal races with last exit
2012-03-05 15:49:43 -08:00
mm/mempolicy.c: mpol_equal(): use bool
2012-01-10 16:30:45 -08:00
mm: fix warnings regarding enum migrate_mode
2012-01-23 08:38:47 -08:00
mm: fix warnings regarding enum migrate_mode
2012-01-23 08:38:47 -08:00
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-01-11 19:12:10 -08:00
mm: remove del_page_from_lru, add page_off_lru
2012-01-12 20:13:10 -08:00
mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
2012-01-12 20:13:03 -08:00
mm: enum lru_list lru
2012-01-12 20:13:10 -08:00
Merge 3.3-rc2 into the driver-core-next branch.
2012-02-02 11:24:44 -08:00
module: struct module_ref should contains long fields
2012-01-13 09:32:14 +10:30
module_param: check that bool parameters really are bool.
2012-01-13 09:32:28 +10:30
lib/mpi: replaced MPI_NULL with normal NULL
2012-02-02 00:23:14 +11:00
PCI/sysfs: add per pci device msi[x] irq listing (v5)
2012-01-06 12:10:25 -08:00
sock: Introduce the SO_PEEK_OFF sock option
2012-02-21 15:03:48 -05:00
net: Support RX-ALL feature flag.
2012-02-24 01:42:07 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -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
netlink: allow to pass data pointer to netlink_dump_start() callback
2012-02-26 14:10:44 -05:00
NFC: Add device powered netlink attribute
2012-03-06 15:16:19 -05:00
NFSv4: Save the owner/group name string when doing open
2012-01-07 13:22:46 -05:00
NFSv4: Fix an Oops in the NFSv4 getacl code
2012-02-03 18:50:34 -05:00
cfg80211: Add background scan period attribute.
2012-03-12 14:19:34 -04:00
Core device tree changes for Linux v3.4
2012-03-21 10:30:03 -07:00
of/address: add empty static inlines for !CONFIG_OF
2012-02-16 06:11:23 -07:00
drivercore: Output common devicetree information in uevent
2012-02-01 14:26:30 -07:00
irq_domain: Centralize definition of irq_dispose_mapping()
2012-02-26 16:48:06 -07:00
dt: fix twl4030 for non-dt compile on x86
2012-03-05 08:09:09 -07:00
mm: unify remaining mem_cont, mem, etc. variable names to memcg
2012-01-12 20:13:06 -08:00
padata: Fix race on sequence number wrap
2012-03-14 17:25:56 +08:00
mm: more intensive memory corruption debugging
2012-01-10 16:30:42 -08:00
memcg: simplify LRU handling by new rule
2012-01-12 20:13:07 -08:00
mm: fewer underscores in ____pagevec_lru_add
2012-01-12 20:13:10 -08:00
PCI: Rework ASPM disable code
2012-01-06 12:10:26 -08: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
tg3: Recode PCI MRRS adjustment as a PCI quirk
2012-03-04 20:54:01 -05:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
percpu: fix __this_cpu_{sub,inc,dec}_return() definition
2012-03-04 09:34:15 -08:00
perf: Add ABI reference sizes
2012-03-09 08:26:05 +01:00
phylib: introduce mdiobus_alloc_size()
2012-01-12 15:23:04 -08:00
procfs: add hidepid= and gid= mount options
2012-01-10 16:30:54 -08:00
net/sched: sch_plug - Queue traffic until an explicit release command
2012-02-07 12:54:56 -05:00
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-01-08 13:10:57 -08:00
Merge branch 'pm-qos'
2012-03-16 21:49:24 +01:00
PM / Domains: Introduce "always on" device flag
2012-03-16 21:44:59 +01:00
PM / QoS: Make it possible to expose PM QoS latency constraints
2012-03-13 22:37:14 +01:00
PM / Sleep: Add more wakeup source initialization routines
2012-03-04 23:08:46 +01:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
ppp: Move ioctl definitions from if_ppp.h to new ppp-ioctl.h
2012-03-04 20:41:38 -05:00
ppp: Change copyright notices from ANU to me
2012-03-04 20:41:38 -05:00
Yama: add PR_SET_PTRACER_ANY
2012-02-16 10:25:18 +11:00
sched/rt: Document scheduler related skip-resched-check sites
2012-03-01 10:28:04 +01:00
driver core merge for 3.4-rc1
2012-03-20 11:16:20 -07:00
procfs: make proc_get_link to use dentry instead of inode
2012-01-10 16:30:54 -08:00
lib: proportion: lower PROP_MAX_SHIFT to 32 on 64-bit kernel
2012-02-01 16:53:46 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit
2012-01-17 16:41:31 -08:00
quota: Pass information that quota is stored in system file to userspace
2012-01-12 13:09:09 +01:00
radix_tree: remove radix_tree_indirect_to_ptr()
2012-01-12 20:13:12 -08:00
rcu: Add RCU_NONIDLE() for idle-loop RCU read-side critical sections
2012-02-21 09:06:13 -08:00
rcu: Prevent RCU callbacks from executing before scheduler initialized
2012-02-21 09:03:41 -08:00
rcu: Call out dangers of expedited RCU primitives
2012-02-21 09:06:08 -08:00
regset: Return -EFAULT, not -EIO, on host-side memory fault
2012-03-02 11:38:15 -08:00
reiserfs: Properly display mount options in /proc/mounts
2012-01-06 23:20:13 -05:00
reiserfs: Properly display mount options in /proc/mounts
2012-01-06 23:20:13 -05:00
net: introduce res_counter_charge_nofail() for socket allocations
2012-01-22 15:08:46 -05:00
mm: unify remaining mem_cont, mem, etc. variable names to memcg
2012-01-12 20:13:06 -08:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-20 10:31:44 -07: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
TTY: serial, simplify ASYNC_USR_MASK
2012-03-08 11:38:50 -08:00
serial: introduce generic port in/out helpers
2012-03-09 12:47:56 -08:00
dma: sh_dma: not all SH DMAC implementations support MEMCPY
2012-02-01 22:23:53 +05:30
net: sh_eth: change the condition of initialization
2012-02-16 17:08:09 -05:00
sh: pfc: Unlock register support
2012-01-09 09:33:57 +09:00
SHM_UNLOCK: fix Unevictable pages stranded after swap
2012-01-23 08:38:48 -08:00
signal: add block_sigmask() for adding sigmask to current->blocked
2012-01-10 16:30:54 -08:00
epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()
2012-02-24 11:42:50 -08:00
net: update the usage of CHECKSUM_UNNECESSARY
2012-03-19 17:37:35 -04:00
tracing/mm: Move include of trace/events/kmem.h out of header into slab.c
2012-01-09 14:19:33 -08:00
tcp: reduce out_of_order memory use
2012-03-19 16:53:08 -04:00
net: get rid of some pointless casts to sockaddr
2012-03-11 19:11:22 -07:00
rcu: Convert WARN_ON_ONCE() in rcu_lock_acquire() to lockdep
2012-02-21 09:06:09 -08: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
tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h
2012-02-10 10:44:35 -08:00
PM / Sleep: Drop suspend_stats_update()
2012-02-17 23:36:23 +01:00
SHM_UNLOCK: fix Unevictable pages stranded after swap
2012-01-23 08:38:48 -08:00
drivers/base: add bus for System-on-Chip devices
2012-02-10 11:42:25 -08:00
sys_poll: fix incorrect type for 'timeout' parameter
2012-02-21 17:24:20 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-03-01 17:57:40 -05:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
ntp: Access tick_length variable via ntp_tick_length()
2012-01-26 19:44:23 -08: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
TTY: provide tty_standard_install helper
2012-02-02 14:55:45 -08:00
TTY: tty_driver, document tty->ops->shutdown limitation
2012-03-08 11:38:51 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-01-08 13:21:22 -08:00
USB: dynamically allocate usb_device children pointers instead of using a fix array
2012-03-13 14:24:07 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-01-15 12:49:56 -08:00
virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff
2012-01-12 15:44:44 +10:30
virtio: harsher barriers for rpmsg.
2012-01-12 15:44:42 +10:30
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
sched/wait: Add __wake_up_all_locked() API
2012-03-01 10:28:04 +01:00
Block: use a freezable workqueue for disk-event polling
2012-03-02 10:51:00 +01:00
writeback: fix typo in the writeback_control comment
2012-03-07 16:08:46 +01:00
