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

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

Browse source 
Version bump conflict in batman-adv, take what's in net-next.

iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-09-25 10:35:29 -07:00
commit a06ee256e5
284 changed files with 2527 additions and 1585 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