kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 4.19-rc6 into usb-next

Browse source 
We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2018-09-30 08:09:14 -07:00
commit 29f79155b9
453 changed files with 4145 additions and 2280 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/uapi/linux/keyctl.h
View file

@ -65,7 +65,7 @@
/* keyctl structures */
struct keyctl_dh_params {
__s32 dh_private;
__s32 private;
__s32 prime;
__s32 base;
};

1
include/uapi/linux/kvm.h
View file

@ -952,6 +952,7 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_S390_HPAGE_1M 156
#define KVM_CAP_NESTED_STATE 157
#define KVM_CAP_ARM_INJECT_SERROR_ESR 158
#define KVM_CAP_MSR_PLATFORM_INFO 159
#ifdef KVM_CAP_IRQ_ROUTING