David Howells
99db443506
PKCS#7: Appropriately restrict authenticated attributes and content type ...
A PKCS#7 or CMS message can have per-signature authenticated attributes
that are digested as a lump and signed by the authorising key for that
signature. If such attributes exist, the content digest isn't itself
signed, but rather it is included in a special authattr which then
contributes to the signature.
Further, we already require the master message content type to be
pkcs7_signedData - but there's also a separate content type for the data
itself within the SignedData object and this must be repeated inside the
authattrs for each signer [RFC2315 9.2, RFC5652 11.1].
We should really validate the authattrs if they exist or forbid them
entirely as appropriate. To this end:
(1) Alter the PKCS#7 parser to reject any message that has more than one
signature where at least one signature has authattrs and at least one
that does not.
(2) Validate authattrs if they are present and strongly restrict them.
Only the following authattrs are permitted and all others are
rejected:
(a) contentType. This is checked to be an OID that matches the
content type in the SignedData object.
(b) messageDigest. This must match the crypto digest of the data.
(c) signingTime. If present, we check that this is a valid, parseable
UTCTime or GeneralTime and that the date it encodes fits within
the validity window of the matching X.509 cert.
(d) S/MIME capabilities. We don't check the contents.
(e) Authenticode SP Opus Info. We don't check the contents.
(f) Authenticode Statement Type. We don't check the contents.
The message is rejected if (a) or (b) are missing. If the message is
an Authenticode type, the message is rejected if (e) is missing; if
not Authenticode, the message is rejected if (d) - (f) are present.
The S/MIME capabilities authattr (d) unfortunately has to be allowed
to support kernels already signed by the pesign program. This only
affects kexec. sign-file suppresses them (CMS_NOSMIMECAP).
The message is also rejected if an authattr is given more than once or
if it contains more than one element in its set of values.
(3) Add a parameter to pkcs7_verify() to select one of the following
restrictions and pass in the appropriate option from the callers:
(*) VERIFYING_MODULE_SIGNATURE
This requires that the SignedData content type be pkcs7-data and
forbids authattrs. sign-file sets CMS_NOATTR. We could be more
flexible and permit authattrs optionally, but only permit minimal
content.
(*) VERIFYING_FIRMWARE_SIGNATURE
This requires that the SignedData content type be pkcs7-data and
requires authattrs. In future, this will require an attribute
holding the target firmware name in addition to the minimal set.
(*) VERIFYING_UNSPECIFIED_SIGNATURE
This requires that the SignedData content type be pkcs7-data but
allows either no authattrs or only permits the minimal set.
(*) VERIFYING_KEXEC_PE_SIGNATURE
This only supports the Authenticode SPC_INDIRECT_DATA content type
and requires at least an SpcSpOpusInfo authattr in addition to the
minimal set. It also permits an SPC_STATEMENT_TYPE authattr (and
an S/MIME capabilities authattr because the pesign program doesn't
remove these).
(*) VERIFYING_KEY_SIGNATURE
(*) VERIFYING_KEY_SELF_SIGNATURE
These are invalid in this context but are included for later use
when limiting the use of X.509 certs.
(4) The pkcs7_test key type is given a module parameter to select between
the above options for testing purposes. For example:
echo 1 >/sys/module/pkcs7_test_key/parameters/usage
keyctl padd pkcs7_test foo @s </tmp/stuff.pkcs7
will attempt to check the signature on stuff.pkcs7 as if it contains a
firmware blob (1 being VERIFYING_FIRMWARE_SIGNATURE).
Suggested-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Marcel Holtmann <marcel@holtmann.org>
Reviewed-by: David Woodhouse <David.Woodhouse@intel.com>
2015-08-12 17:01:01 +01:00
Update Viresh Kumar's email address
2015-07-17 16:39:53 -07:00
bcma: make calls to PCI hostmode functions config-safe
2015-06-08 14:33:26 +03:00
can: replace timestamp as unique skb attribute
2015-07-12 21:13:22 +02:00
libceph: enable ceph in a non-default network namespace
2015-07-09 20:30:34 +03:00
crush: sync up with userspace
2015-06-25 11:49:31 +03:00
dmaengine: pxa: add pxa dmaengine driver
2015-05-26 09:18:29 +05:30
extcon: Use the unique id for external connector instead of string
2015-05-22 18:58:44 +09:00
fsl /bestcomm
gpio: Remove double "base" in comment
2015-07-16 00:12:24 +02:00
mfd: twl4030-power: Fix pmic for boards that need AC charger disabled
2015-06-22 12:25:04 +01:00
iio: Specify supported modes for buffers
2015-06-01 11:31:12 +01:00
Input: improve parsing OF parameters for touchscreens
2015-06-25 14:45:46 -07:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-06-27 12:44:34 -07:00
Char/Misc driver patches for 4.2-rc1
2015-06-26 14:51:15 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
mmc: mediatek: Add Mediatek MMC driver
2015-06-18 09:20:48 +02:00
mtd: cfi: deinline large functions
2015-05-27 12:42:16 -07:00
netfilter: xtables: fix warnings on 32bit platforms
2015-06-18 21:14:33 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-06-23 14:08:54 -07:00
phy: for 4.2 merge window
2015-06-03 14:13:41 +09:00
pinctrl: use "const struct ..." rather than "struct ... const"
2015-06-01 15:48:12 +02:00
- remoteproc fixes/cleanups from Suman Anna
2015-07-03 14:57:50 -07:00
power: max17042_battery: add HEALTH and TEMP_* properties support
2015-05-23 22:43:28 +02:00
Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next
2015-06-22 11:19:56 +01:00
ARM: BCM63xx: Add Broadcom BCM63xx PMB controller helpers
2015-05-20 15:05:39 -07:00
ARM: prima2: move to use REGMAP APIs for rtciobrg
2015-06-10 15:10:26 +08:00
timer: Reduce timer migration overhead if disabled
2015-06-19 15:18:28 +02:00
drivers: soc: sunxi: Introduce SoC driver to map SRAMs
2015-06-01 17:57:34 +02:00
cc2520: fix CC2591 handling
2015-05-31 13:40:53 +02:00
MIPS: BCM47xx: Extract info about et2 interface
2015-06-21 21:52:24 +02:00
NFS client updates for Linux 4.2
2015-07-02 11:32:23 -07:00
usb: add bus type for USB ULPI
2015-05-13 12:04:55 -05:00
cdc_ncm: Add support for moving NDP to end of NCM frame
2015-07-09 14:58:31 -07:00
Merge branch 'acpi-scan'
2015-07-07 22:48:25 +02:00
ASN.1: Handle 'ANY OPTIONAL' in grammar
2015-08-05 13:38:07 +01:00
libata: READ LOG DMA EXT support can be in either page 119 or 120
2015-05-05 09:30:19 -04:00
writeback: don't embed root bdi_writeback_congested in bdi_writeback
2015-07-02 08:46:00 -06:00
writeback: don't embed root bdi_writeback_congested in bdi_writeback
2015-07-02 08:46:00 -06:00
backlight: Change the return type of backlight_update_status() to int
2015-06-23 15:47:35 +01:00
gpio: gpio-generic: add flag to read out output value from reg_set
2015-05-11 11:49:02 +02:00
MIPS: BCM47xx: Move NVRAM driver to the drivers/firmware/
2015-06-21 21:55:33 +02:00
blkcg: implement bio_associate_blkcg()
2015-06-02 08:33:34 -06:00
blkcg: fix blkcg_policy_data allocation bug
2015-07-09 14:41:11 -06:00
blk-mq: Shared tag enhancements
2015-06-01 14:35:56 -06:00
Revert "block, dm: don't copy bios for request clones"
2015-06-26 10:11:58 -04:00
- Revert block and DM core changes the removed request-based DM's
2015-06-26 12:35:01 -07:00
mm: only define hashdist variable when needed
2015-06-24 17:49:41 -07:00
sched/preempt: Merge preempt_mask.h into preempt.h
2015-05-19 08:39:11 +02:00
bpf: allow networking programs to use bpf_trace_printk() for debugging
2015-06-15 15:53:50 -07:00
net: phy: broadcom: define Broadcom pseudo-PHY address in brcmphy.h
2015-06-10 23:33:58 -07:00
bufferhead: Add _gfp version for sb_getblk()
2015-07-02 01:32:44 -04:00
drivers/base: cacheinfo: fix annoying typo when DT nodes are absent
2015-05-24 12:31:33 -07:00
cgroup: require write perm on common ancestor when moving processes on the default hierarchy
2015-06-18 16:54:28 -04:00
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-06-26 19:50:04 -07:00
clk: tegra: Changes for v4.2-rc1
2015-06-20 13:29:48 -07:00
clkdev: get rid of redundant clk_add_alias() prototype in linux/clk.h
2015-05-06 11:58:51 +01:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
clockevents: Rename state to state_use_accessors
2015-06-02 16:56:42 +02:00
Merge branch 'linus' into timers/core
2015-05-19 16:12:32 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
compiler-gcc: integrate the various compiler-gcc[345].h files
2015-06-25 17:00:38 -07:00
compiler-intel: fix wrong compiler barrier() macro
2015-06-25 17:00:38 -07:00
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm
2015-07-11 20:44:31 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
printk: implement support for extended console drivers
2015-06-25 17:00:38 -07:00
vt: add cursor blink interval escape sequence
2015-05-10 19:15:52 +02:00
context_tracking: Inherit TIF_NOHZ through forks instead of context switches
2015-05-07 12:02:51 +02:00
context_tracking: Protect against recursion
2015-05-07 12:02:50 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
thermal: cpu_cooling: implement the power cooling device API
2015-05-04 21:27:52 -07:00
cpufreq: Track cpu managing sysfs kobjects separately
2015-05-23 00:49:04 +02:00
Merge branches 'pm-sleep' and 'pm-runtime'
2015-06-19 01:18:02 +02:00
cpumask_set_cpu_local_first => cpumask_local_spread, lament
2015-05-28 11:05:20 +09:30
lib: crc-itu-t.[ch] fix 0x0x prefix in integer constants
2015-05-26 15:26:43 +02:00
lib: introduce crc_t10dif_update()
2015-05-30 22:42:24 -07:00
crypto: algif_aead - Temporarily disable all AEAD algorithms
2015-06-22 15:49:30 +08:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
debugfs: switch to simple_follow_link()
2015-05-10 22:18:24 -04:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
dma-buf: add ref counting for module as exporter
2015-05-13 14:35:57 +05:30
Merge branch 'topic/xdmac' into for-linus
2015-06-25 09:21:49 +05:30
remove <asm/scatterlist.h>
2015-05-05 13:35:39 -06:00
iommu: dmar: Provide helper to copy shared irte fields
2015-06-12 11:33:52 +02:00
firmware: dmi: struct dmi_header should be packed
2015-06-25 09:06:57 +02:00
The libnvdimm sub-system introduces, in addition to the libnvdimm-core,
2015-06-29 10:34:42 -07:00
cfq-iosched: fix the setting of IOPS mode on SSDs
2015-06-10 08:01:20 -06:00
etherdev: Fix sparse error, make test usable by other functions
2015-05-05 19:24:42 -04:00
extcon: Redefine the unique id of supported external connectors without 'enum extcon' type
2015-06-12 17:01:42 -07:00
f2fs crypto: declare some definitions for f2fs encryption feature
2015-05-28 15:41:45 -07:00
fs/file.c: don't acquire files->file_lock in fd_install()
2015-07-01 02:30:09 -04:00
bpf: allow bpf programs to tail-call other bpf programs
2015-05-21 17:07:59 -04:00
frontswap: allow multiple backends
2015-06-24 17:49:45 -07:00
locks: inline posix_lock_file_wait and flock_lock_file_wait
2015-07-13 06:29:11 -04:00
drivers:usb:fsl: Add support for USB controller version-2.5
2015-05-31 15:51:24 +09:00
fsnotify: remove obsolete documentation
2015-06-24 17:49:38 -07:00
genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()
2015-06-30 19:45:01 -07:00
mm: meminit: finish initialisation of struct pages before basic setup
2015-06-30 19:44:56 -07:00
staging: goldfish: Fix pointer cast for 32 bits
2015-05-31 11:40:14 +09:00
gpio: remove gpiod_sysfs_set_active_low
2015-05-12 10:46:53 +02:00
sched/preempt: Merge preempt_mask.h into preempt.h
2015-05-19 08:39:11 +02:00
First set of IIO fixes for the 4.2 cycle.
2015-07-13 14:18:07 -07:00
HID: Export hid_field_extract()
2015-06-01 14:33:35 +02:00
sched/preempt, mm/kmap: Explicitly disable/enable preemption in kmap_atomic_*
2015-05-19 08:39:14 +02:00
timer: Minimize nohz off overhead
2015-06-19 15:18:28 +02:00
mm: hugetlb: allow hugepages_supported to be architecture specific
2015-07-17 16:39:52 -07:00
hwspinlock/core: add device tree support
2015-05-02 09:54:30 +03:00
Drivers: hv: vmbus: Implement NUMA aware CPU affinity for channels
2015-06-01 10:56:31 +09:00
block: move PM request support to IDE
2015-05-05 13:40:42 -06:00
ieee802154: Fix EUI-64 station address validation.
2015-05-31 13:40:53 +02:00
net/core: Add reading VF statistics through the PF netdevice
2015-06-15 17:23:03 -07:00
macvtap: Increase limit of macvtap queues
2015-06-23 06:14:04 -07:00
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
vlan: Add GRO support for non hardware accelerated vlan
2015-06-01 16:50:52 -07:00
net: Export IGMP/MLD message validation code
2015-05-04 14:49:23 -04:00
sock_diag: specify info_size per inet protocol
2015-06-15 19:49:22 -07:00
net: ipv4 sysctl option to ignore routes when nexthop link is down
2015-06-24 02:15:54 -07:00
module: relocate module_init from init.h to module.h
2015-07-05 23:59:14 -04:00
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-06-26 19:50:04 -07:00
IOMMU Updates for Linux v4.2
2015-06-23 18:27:19 -07:00
sched/preempt, mm/kmap: Explicitly disable/enable preemption in kmap_atomic_*
2015-05-19 08:39:14 +02:00
x86/mm: Decouple <linux/vmalloc.h> from <asm/io.h>
2015-06-03 12:02:00 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
genirq: Clean up outdated comments related to include/linux/irqdesc.h
2015-06-25 12:06:34 +02:00
irqchip: Move IRQCHIP_DECLARE macro to include/linux/irqchip.h
2015-07-02 22:34:38 +02:00
hotplug: Prevent alloc/free of irq descriptors during cpu up/down
2015-07-08 11:32:25 +02:00
irqdomain: Add non-hierarchy helper irq_domain_set_info
2015-05-18 17:32:43 +02:00
genirq: Remove irq_node()
2015-06-25 12:06:45 +02:00
jbd2: fix ocfs2 corrupt when updating journal superblock fails
2015-06-15 14:36:01 -04:00
time: Allow gcc to fold usecs_to_jiffies(constant)
2015-06-10 11:31:14 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2015-07-03 15:20:57 -07:00
mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()
2015-06-24 17:49:46 -07:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
ktime: Fix ktime_divns to do signed division
2015-05-13 10:19:35 +02:00
KVM: count number of assigned devices
2015-07-10 13:25:26 +02:00
KVM: add memslots argument to kvm_arch_memslots_updated
2015-05-26 12:40:17 +02:00
leds: unify the location of led-trigger API
2015-05-04 11:05:55 -07:00
sched/stop_machine: Fix deadlock between multiple stop_two_cpus()
2015-06-19 10:03:12 +02:00
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2015-06-25 16:49:21 -07:00
libfdt: add fdt type definitions
2015-04-29 17:17:17 -05:00
libnvdimm: Add sysfs numa_node to NVDIMM devices
2015-06-26 11:23:38 -04:00
livepatch: introduce patch/func-walking helpers
2015-05-19 23:58:43 +02:00
Merge branch 'sched-hrtimers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-06-24 15:09:40 -07:00
Yama: remove needless CONFIG_SECURITY_YAMA_STACKED
2015-07-28 13:18:19 +10:00
mailbox: Add ability for clients to request channels by name
2015-06-11 22:19:45 +05:30
mailbox: Make mbox_chan_ops const
2015-05-12 09:18:16 +05:30
bus: mvebu-mbus: add mv_mbus_dram_info_nooverlap()
2015-05-28 12:21:08 +02:00
mdio-gpio: Propagate mii_bus.phy_ignore_ta_mask
2015-05-14 22:35:13 -04:00
mei: export mei client device struct to external use
2015-05-24 11:15:54 -07:00
memblock: introduce a for_each_reserved_mem_region iterator
2015-06-30 19:44:55 -07:00
Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block
2015-06-25 16:00:17 -07:00
mm: new arch_remap() hook
2015-06-24 17:49:41 -07:00
mm: meminit: make __early_pfn_to_nid SMP-safe and introduce meminit_pfn_in_nid
2015-06-30 19:44:56 -07:00
mm/net: Rename and move page fragment handling from net/ to mm/
2015-05-12 10:39:26 -04:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
mm: clarify that the function operates on hugepage pte
2015-06-24 17:49:44 -07:00
mm: meminit: initialise a subset of struct pages if CONFIG_DEFERRED_STRUCT_PAGE_INIT is set
2015-06-30 19:44:56 -07:00
ACPI / scan: Add support for ACPI _CLS device matching
2015-07-07 01:55:20 +02:00
module: relocate module_init from init.h to module.h
2015-07-05 23:59:14 -04:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
MPILIB: add mpi_read_buf() and mpi_get_size() helpers
2015-06-16 14:35:06 +08:00
turn user_{path_at,path,lpath,path_dir}() into static inlines
2015-05-15 01:10:45 -04:00
libnvdimm: infrastructure for btt devices
2015-06-25 04:20:04 -04:00
net: Add a struct net parameter to sock_create_kern
2015-05-11 10:50:17 -04:00
switchdev: remove NETIF_F_HW_SWITCH_OFFLOAD feature flag
2015-05-12 18:43:55 -04:00
net/core: Add reading VF statistics through the PF netdevice
2015-06-15 17:23:03 -07:00
netfilter: don't pull include/linux/netfilter.h from netns headers
2015-06-18 21:14:31 +02:00
net: ip_fragment: remove BRIDGE_NETFILTER mtu special handling
2015-06-12 14:16:46 +02:00
netfilter: don't pull include/linux/netfilter.h from netns headers
2015-06-18 21:14:31 +02:00
netfilter: add netfilter ingress hook after handle_ing() under unique static key
2015-05-14 01:10:05 -04:00
netfilter: bridge: forward IPv6 fragmented packets
2015-06-12 14:10:12 +02:00
netlink: allow to listen "all" netns
2015-05-09 22:15:31 -04:00
NFSv.2/pnfs Add a LAYOUTSTATS rpc function
2015-06-24 10:17:37 -04:00
nfs42: serialize LAYOUTSTATS calls of the same file
2015-06-24 10:53:11 -04:00
NFSv4.2: LAYOUTSTATS is optional to implement
2015-06-27 11:48:58 -04:00
NFS: Remove unused nfs_rw_ops->rw_release() function
2015-06-10 18:32:40 -04:00
NFSv.2/pnfs Add a LAYOUTSTATS rpc function
2015-06-24 10:17:37 -04:00
nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()
2015-05-05 17:10:11 -07:00
watchdog: add watchdog_cpumask sysctl to assist nohz
2015-06-24 17:49:40 -07:00
NTB: Add NTB hardware abstraction layer
2015-07-04 14:04:44 -04:00
NTB: Split ntb_hw_intel and ntb_transport drivers
2015-07-04 14:05:49 -04:00
NVMe: Automatic namespace rescan
2015-06-05 10:58:34 -06:00
Devicetree changes for v4.2
2015-07-01 19:40:18 -07:00
of: add helper function to retrive match data
2015-05-28 12:59:40 -05:00
dmaengine: of_dma: Support for DMA routers
2015-05-09 17:11:25 +05:30
Devicetree changes for v4.2
2015-07-01 19:40:18 -07:00
of: fix a build error to of_graph_get_endpoint_by_regs function
2015-06-24 11:18:48 +10:00
PKCS#7: Appropriately restrict authenticated attributes and content type
2015-08-12 17:01:01 +01:00
mm: oom_kill: simplify OOM killer locking
2015-06-24 17:49:43 -07:00
locking/rwsem: Reduce spinlock contention in wakeup after up_read()/up_write()
2015-05-08 12:27:59 +02:00
mm/page_owner: set correct gfp_mask on page_owner
2015-07-17 16:39:54 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-07-04 19:36:06 -07:00
parport: add device-model to parport subsystem
2015-06-01 07:08:18 +09:00
Update Viresh Kumar's email address
2015-07-17 16:39:53 -07:00
Merge branches 'pci/aspm', 'pci/enumeration', 'pci/hotplug', 'pci/misc', 'pci/msi', 'pci/resource' and 'pci/virtualization' into next
2015-06-12 15:26:45 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
percpu_counter: batch size aware __percpu_counter_compare()
2015-05-29 07:39:34 +10:00
This patch series contains several clean ups and even a new trace clock
2015-06-26 14:02:43 -07:00
net: phy: Add phy_interface_is_rgmii helper
2015-05-27 00:27:35 -04:00
platform_device: better support builtin boilerplate avoidance
2015-06-16 14:12:37 -04:00
Merge branch 'pm-wakeirq'
2015-06-19 01:18:14 +02:00
PM / clock_ops: Provide default runtime ops to users
2015-05-12 23:55:37 +02:00
PM / wakeirq: Fix typo in prototype for dev_pm_set_dedicated_wake_irq
2015-05-30 02:17:15 +02:00
PM / Wakeirq: Add automated device wake IRQ handling
2015-05-20 01:56:31 +02:00
The libnvdimm sub-system introduces, in addition to the libnvdimm-core,
2015-06-29 10:34:42 -07:00
power: Add devm_power_supply_get_by_phandle() helper function
2015-06-10 16:15:54 +02:00
sched, preempt_notifier: separate notifier registration from static_key inc/dec
2015-07-03 18:55:00 +02:00
include, lib: add __printf attributes to several function prototypes
2015-07-17 16:39:53 -07:00
device property: Introduces device_dma_is_coherent()
2015-06-15 14:40:49 +02:00
seccomp: add ptrace options for suspend/resume
2015-07-15 11:52:52 -07:00
pwm: Add pwmchip_add_with_polarity() API
2015-06-12 11:36:30 +02:00
spi: pxa2xx: Prepare for new Intel LPSS SPI type
2015-06-05 11:40:45 +01:00
firmware: qcom: scm: Add HDCP Support
2015-05-28 10:47:45 -05:00
random: Remove kernel blocking API
2015-06-10 19:14:04 +08:00
rbtree: Make lockless searches non-fatal
2015-05-28 11:32:04 +09:30
rbtree: Make lockless searches non-fatal
2015-05-28 11:32:04 +09:30
rbtree: Implement generic latch_tree
2015-05-28 11:32:06 +09:30
rculist: Fix another sparse warning
2015-05-27 12:58:04 -07:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
rcu: Further shrink Tiny RCU by making empty functions static inlines
2015-05-27 12:59:31 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-06-22 18:57:44 -07:00
regmap: Introduce regmap_get_reg_stride
2015-05-22 12:19:21 +01:00
remoteproc: add a rproc ops for performing address translation
2015-06-17 09:57:12 +03:00
rhashtable: Add cap on number of elements in hash table
2015-05-16 18:08:26 -04:00
rapidio: Fix kerneldoc and comment
2015-05-26 15:23:23 +02:00
rtc: interface: Remove rtc_set_mmss()
2015-06-25 01:13:43 +02:00
switchdev; add VLAN support for port's bridge_getlink
2015-06-23 06:56:18 -07:00
drivers/scsi/scsi_debug.c: resolve sg buffer const-ness issue
2015-06-30 19:44:59 -07:00
x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86
2015-07-18 03:42:51 +02:00
misc: mic: SCIF header file and IOCTL interface
2015-05-24 12:13:36 -07:00
seccomp: swap hard-coded zeros to defined name
2015-07-15 11:52:54 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2015-06-27 13:26:03 -07:00
vfs: add seq_file_path() helper
2015-06-23 18:01:07 -04:00
Minor merge needed, due to function move.
2015-07-01 10:49:25 -07:00
serial: 8250: include <linux/serial_reg.h> from serial_8250.h
2015-05-31 16:21:38 +09:00
serial: core: Fix unused variable warnings from uart_console()
2015-05-06 22:27:00 +02:00
serial: sh-sci: Standardize on using the BIT() macro to define register bits
2015-05-10 19:06:38 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2015-06-15 14:30:32 -07:00
Fix kmalloc slab creation sequence
2015-06-29 10:49:51 -07:00
smpboot: allow excluding cpus from the smpboot threads
2015-06-24 17:49:40 -07:00
sock_diag: define destruction multicast groups
2015-06-15 19:49:22 -07:00
documentation: memory-barriers: Fix smp_mb__before_spinlock() semantics
2015-05-27 12:57:27 -07:00
stddef.h: move offsetofend inside #ifndef/#endif guard, neaten
2015-06-25 17:00:38 -07:00
stmmac: add phy-handle support to the platform layer
2015-05-30 17:04:36 -07:00
lib/string.c: introduce strreplace()
2015-06-25 17:00:40 -07:00
lib: add software 842 compression/decompression
2015-05-11 15:06:43 +08:00
suspend: simplify block I/O handling
2015-05-19 09:19:59 -06:00
This patch series contains several clean ups and even a new trace clock
2015-06-26 14:02:43 -07:00
sysctl: Allow creating permanently empty directories that serve as mountpoints.
2015-07-01 10:36:39 -05:00
sysfs: Add support for permanently empty directories to serve as mount points.
2015-07-01 10:36:45 -05:00
check_syslog_permissions() cleanup
2015-06-25 17:00:39 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-05-23 01:22:35 -04:00
thermal: support slope and offset coefficients
2015-05-11 19:46:52 -07:00
tick/broadcast: Unbreak CONFIG_GENERIC_CLOCKEVENTS=n build
2015-07-07 21:56:34 +02:00
time: Prevent early expiry of hrtimers[CLOCK_REALTIME] at the leap second edge
2015-06-12 11:15:49 +02:00
time: Prevent early expiry of hrtimers[CLOCK_REALTIME] at the leap second edge
2015-06-12 11:15:49 +02:00
time: Get rid of do_posix_clock_monotonic_gettime
2015-07-09 10:51:46 +02:00
timer: Reduce timer migration overhead if disabled
2015-06-19 15:18:28 +02:00
sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask()
2015-05-27 15:22:15 +02:00
tracing: Rename ftrace_trigger_soft_disabled() to trace_trigger_soft_disabled()
2015-05-13 15:25:39 -04:00
Merge 4.1-rc4 into tty-next
2015-05-18 14:08:58 -07:00
PCI: Add pci_bus_addr_t
2015-05-29 17:21:45 -05:00
net: make u64_stats_init() a function
2015-06-15 16:02:52 -07:00
sched/preempt, mm/fault: Decouple preemption from the page fault logic
2015-05-19 08:39:18 +02:00
uidgid: make uid_valid and gid_valid work with !CONFIG_MULTIUSER
2015-05-14 17:55:51 -07:00
util_macros.h: have array pointer point to array of constants
2015-05-05 17:10:11 -07:00
PKCS#7: Appropriately restrict authenticated attributes and content type
2015-08-12 17:01:01 +01:00
virtio: add explicit big-endian support to memory accessors
2015-06-01 15:48:54 +02:00
virtio: add explicit big-endian support to memory accessors
2015-06-01 15:48:54 +02:00
vme: export vme_check_window()
2015-06-12 17:26:57 -07:00
virtio: add explicit big-endian support to memory accessors
2015-06-01 15:48:54 +02:00
md updates for 4.2
2015-06-29 11:10:56 -07:00
watchdog: watchdog_core: Add watchdog registration deferral mechanism
2015-06-29 11:51:06 +02:00
workqueue: move flush_scheduled_work() to workqueue.h
2015-05-21 17:26:22 -04:00
writeback: implement foreign cgroup inode detection
2015-06-02 08:40:20 -06:00
zpool: remove zpool_evict()
2015-06-25 17:00:37 -07:00
99db443506