q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers
History
Linus Torvalds 33673dcb37 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 
Pull security subsystem updates from James Morris:
 "This is basically a maintenance update for the TPM driver and EVM/IMA"

Fix up conflicts in lib/digsig.c and security/integrity/ima/ima_main.c

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (45 commits)
  tpm/ibmvtpm: build only when IBM pseries is configured
  ima: digital signature verification using asymmetric keys
  ima: rename hash calculation functions
  ima: use new crypto_shash API instead of old crypto_hash
  ima: add policy support for file system uuid
  evm: add file system uuid to EVM hmac
  tpm_tis: check pnp_acpi_device return code
  char/tpm/tpm_i2c_stm_st33: drop temporary variable for return value
  char/tpm/tpm_i2c_stm_st33: remove dead assignment in tpm_st33_i2c_probe
  char/tpm/tpm_i2c_stm_st33: Remove __devexit attribute
  char/tpm/tpm_i2c_stm_st33: Don't use memcpy for one byte assignment
  tpm_i2c_stm_st33: removed unused variables/code
  TPM: Wait for TPM_ACCESS tpmRegValidSts to go high at startup
  tpm: Fix cancellation of TPM commands (interrupt mode)
  tpm: Fix cancellation of TPM commands (polling mode)
  tpm: Store TPM vendor ID
  TPM: Work around buggy TPMs that block during continue self test
  tpm_i2c_stm_st33: fix oops when i2c client is unavailable
  char/tpm: Use struct dev_pm_ops for power management
  TPM: STMicroelectronics ST33 I2C BUILD STUFF
  ...
2013-02-21 08:18:12 -08:00
..
accessibility
acpi ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
amba
ata ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
atm atm/iphase: rename fregt_t -> ffreg_t 2013-02-08 14:22:05 -05:00
auxdisplay
base ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
bcma Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-02-14 14:23:33 -05:00
block Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2013-02-20 14:27:00 -08:00
bluetooth
bus
cdrom
char Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 2013-02-21 08:18:12 -08:00
clk ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
clocksource clk: sunxi: Use common of_clk_init() function 2013-01-24 11:12:23 -08:00
connector net: proc: change proc_net_remove to remove_proc_entry 2013-02-18 14:53:08 -05:00
cpufreq Merge branch 'pm-cpufreq' 2013-02-17 14:38:13 +01:00
cpuidle PM / tracing: remove deprecated power trace API 2013-01-26 00:39:12 +01:00
crypto
dca
devfreq PM / devfreq: exynos4_bus: honor RCU lock usage 2013-01-22 13:28:40 +01:00
dio
dma Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma 2013-01-24 10:17:49 -08:00
edac EDAC updates for 3.9 2013-02-20 11:28:50 -08:00
eisa
extcon
firewire firewire net: Use LL_RESERVED_SPACE(), HH_DATA_OFF(). 2013-01-20 23:16:03 -05:00
firmware Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-01-31 17:10:36 +11:00
gpio Device tree changes for v3.9 2013-02-20 11:04:46 -08:00
gpu Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile into akpm 2013-02-12 15:13:42 -08:00
hid Merge branch 'for-3.8/upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 2013-02-01 08:44:59 +11:00
hsi
hv x86, hyperv: HYPERV depends on X86_LOCAL_APIC 2013-02-12 17:46:23 -08:00
hwmon ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
hwspinlock
i2c ACPI: Remove useless type argument of driver .remove() operation 2013-01-26 00:37:24 +01:00
ide
idle intel_idle: export both C1 and C1E 2013-02-13 18:22:08 -05:00
iio
infiniband Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-02-08 18:02:14 -05:00
input ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
iommu Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-02-19 19:07:27 -08:00
ipack
irqchip
isdn Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-02-20 18:58:50 -08:00
leds
lguest
macintosh
mailbox ARM / highbank: add support for pl320 IPC 2013-02-02 00:01:15 +01:00
md A fix for stacked dm thin devices and a fix for the new dm WRITE SAME 2013-02-01 12:04:22 +11:00
media Revert "[media] dvb_frontend: return -ENOTTY for unimplement IOCTL" 2013-02-15 12:11:23 -08:00
memory
memstick
message
mfd - Four new drivers: 2013-02-20 10:19:07 -08:00
misc x86, uv, uv3: Check current gru hub support for SGI UV3 2013-02-11 17:18:19 -08:00
mmc Merge branches 'fixes' and 'mmci' into for-linus 2013-02-20 14:35:45 +00:00
mtd A small set of simple regression and build fixes for 3.8: 2013-02-05 07:54:11 +11:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-02-20 18:58:50 -08:00
nfc Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-02-18 13:47:13 -05:00
nubus
of Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-02-20 18:58:50 -08:00
oprofile
parisc
parport
pci ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
pcmcia
pinctrl These are the main pinctrl changes for the v3.9 merge window: 2013-02-20 09:23:30 -08:00
platform ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
pnp PNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.c 2013-01-31 21:11:08 +01:00
power - Four new drivers: 2013-02-20 10:19:07 -08:00
pps
ps3
ptp
pwm
rapidio
regulator Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next 2013-02-19 12:43:12 +00:00
remoteproc
rpmsg
rtc Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-02-19 19:05:45 -08:00
s390 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-01-29 15:32:13 -05:00
sbus
scsi efi: Make 'efi_enabled' a function to query EFI facilities 2013-01-30 11:51:59 -08:00
sfi
sh
sn
spi Device tree changes for v3.9 2013-02-20 11:04:46 -08:00
ssb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-02-14 14:23:33 -05:00
staging Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-02-20 18:58:50 -08:00
target target: Fix divide by zero bug in fabric_max_sectors for unconfigured devices 2013-01-31 15:22:53 -08:00
tc
thermal
tty Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2013-02-20 11:00:43 -08:00
uio
usb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-02-08 18:02:14 -05:00
uwb
vfio
vhost Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-02-09 07:55:24 +11:00
video ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
virt
virtio
vlynq
vme
w1
watchdog
xen ACPI and power management updates for 3.9-rc1 2013-02-20 11:26:56 -08:00
zorro
Kconfig ARM / highbank: add support for pl320 IPC 2013-02-02 00:01:15 +01:00
Makefile ARM / highbank: add support for pl320 IPC 2013-02-02 00:01:15 +01:00