[kernel: 63/85] Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
Adam Williamson
adamwill at fedoraproject.org
Wed Nov 26 20:54:02 UTC 2014
commit a18b5849611abfbf56f60e5893d73231947763b6
Merge: 0557a6f 9d990eb
Author: Adam Williamson <awilliam at redhat.com>
Date: Sat Sep 13 10:52:15 2014 -0700
Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
3.17 merge.
Conflicts:
Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
config-armv7
config-armv7-generic
config-armv7-lpae
config-nodebug
kernel-arm64.patch
kernel.spec
secure-modules.patch
sources
...top-Change-Lenovo-Yoga-2-series-rfkill-ha.patch | 138 -
ACPI-Limit-access-to-custom_method.patch | 31 +
ARM-tegra-usb-no-reset.patch | 32 +
Add-EFI-signature-data-types.patch | 57 +
...-EFI-signature-blob-parser-and-key-loader.patch | 179 +
...to-automatically-enforce-module-signature.patch | 186 +
Add-secure_modules-call.patch | 64 +
...-sysrq-option-to-disable-secure-boot-mode.patch | 21 +-
...acom-Add-support-for-the-Cintiq-Companion.patch | 47 +
...acom-Add-support-for-the-Cintiq-Companion.patch | 46 -
KEYS-Add-a-system-blacklist-keyring.patch | 112 +
...rmination-condition-in-assoc-array-garbag.patch | 95 +
...Import-certificates-from-UEFI-Secure-Boot.patch | 186 +
MODSIGN-Support-not-importing-certs-from-db.patch | 84 +
Makefile.config | 12 +-
...wn-BAR-access-when-module-security-is-ena.patch | 117 +
...v-mem-and-dev-kmem-when-module-loading-is.patch | 42 +
...rt-ACPI-video-change-acpi-video-brightnes.patch | 16 +-
...-acpi_rsdp-kernel-parameter-when-module-l.patch | 39 +
...Add-4-new-models-to-the-use_native_backli.patch | 18 +-
...Add-use-native-backlight-quirk-for-the-Th.patch | 18 +-
...Add-use_native_backlight-quirk-for-HP-Pro.patch | 18 +-
arm-beagle.patch | 460 -
...35x-bone-common-add-uart2_pins-uart4_pins.patch | 46 +
...ts-am335x-bone-common-enable-and-use-i2c2.patch | 70 +
...35x-bone-common-setup-default-pinmux-http.patch | 180 +
arm-dts-am335x-boneblack-add-cpu0-opp-points.patch | 42 +
arm-dts-am335x-boneblack-lcdc-add-panel-info.patch | 39 +
...ite.patch => arm-i.MX6-Utilite-device-dtb.patch | 14 +-
arm-qemu-fixdisplay.patch | 472 -
arm-tegra-drmdetection.patch | 111 -
arm-tegra-usb-no-reset-linux33.patch | 16 -
asus-wmi-Add-a-no-backlight-quirk.patch | 69 -
...strict-debugfs-interface-when-module-load.patch | 54 +
ath9k-rx-dma-stop-check.patch | 42 +
ath9k_rx_dma_stop_check.patch | 28 -
config-arm-generic | 31 +-
config-arm64 | 8 +-
config-armv7 | 19 +-
config-armv7-generic | 33 +-
config-armv7-lpae | 2 +-
config-debug | 2 +
config-generic | 160 +-
config-nodebug | 118 +-
config-powerpc-generic | 1 -
config-powerpc32-generic | 180 -
config-powerpc32-smp | 3 -
config-powerpc64 | 1 +
config-powerpc64p7 | 1 +
config-x86-generic | 41 +-
config-x86_64-generic | 8 +
crash-driver.patch | 121 +-
criu-no-expert.patch | 17 +-
die-floppy-die.patch | 20 +-
disable-i8042-check-on-apple-mac.patch | 22 +-
disable-libdw-unwind-on-non-x86.patch | 20 +-
drm-i915-hush-check-crtc-state.patch | 24 +-
...dd-no-backlight-quirk-for-Asus-H87I-PLUS-.patch | 50 -
efi-Add-EFI_SECURE_BOOT-bit.patch | 43 +
...e-secure-boot-if-shim-is-in-insecure-mode.patch | 58 +
...EFI_SECURE_BOOT_SIG_ENFORCE-depend-on-EFI.patch | 30 +
filter-ppc.sh | 14 -
...e-Disable-in-a-signed-modules-environment.patch | 39 +
...store-the-aux-firmware-id-in-multi-plexed.patch | 32 +
input-kill-stupid-messages.patch | 15 +-
...-noise.patch => input-silence-i8042-noise.patch | 64 +-
...ile-after_link.patch => kbuild-AFTER_LINK.patch | 28 +-
kernel-arm64.patch |10487 +++-----------------
kernel.spec | 362 +-
...le-at-runtime-if-the-kernel-enforces-modu.patch | 44 +
...-Make-CPUMASK_OFFSTACK-usable-without-deb.patch | 14 +-
lis3-improve-handling-of-null-rate.patch | 33 +-
modsign-uefi.patch | 624 --
namespaces-remount-fixes.patch | 625 --
...x-kernel-warning-when-removing-proc-entry.patch | 77 +
no-pcspkr-modalias.patch | 15 +-
perf-install-trace-event-plugins.patch | 31 +
perf-lib64.patch | 17 -
...-pinctrl-single-must-be-initialized-early.patch | 38 +
ppc64-fixtools.patch | 12 +
...dd-psmouse_matches_pnp_id-helper-function.patch | 100 +
...-support-for-detecting-FocalTech-PS-2-tou.patch | 158 +
...ng-result-shows-get_report-is-unnecessary.patch | 40 -
...top-Add-broken-acpi-video-quirk-for-NC210.patch | 15 +-
sb-hibernate.patch | 115 -
...sd_revalidate_disk-prevent-NULL-ptr-deref.patch | 21 +-
secure-modules.patch | 877 --
silence-fbcon-logo.patch | 17 +-
sources | 3 +-
...hdog-Disable-watchdog-on-virtual-machines.patch | 14 +-
...wn-IO-port-access-when-module-security-is.patch | 71 +
...t-MSR-access-when-module-loading-is-restr.patch | 43 +
92 files changed, 4675 insertions(+), 13584 deletions(-)
---
More information about the scm-commits
mailing list