Loading Documentation/networking/bonding.txt +6 −5 Original line number Diff line number Diff line Loading @@ -191,11 +191,12 @@ ad_actor_sys_prio ad_actor_system In an AD system, this specifies the mac-address for the actor in protocol packet exchanges (LACPDUs). The value cannot be NULL or multicast. It is preferred to have the local-admin bit set for this mac but driver does not enforce it. If the value is not given then system defaults to using the masters' mac address as actors' system address. protocol packet exchanges (LACPDUs). The value cannot be a multicast address. If the all-zeroes MAC is specified, bonding will internally use the MAC of the bond itself. It is preferred to have the local-admin bit set for this mac but driver does not enforce it. If the value is not given then system defaults to using the masters' mac address as actors' system address. This parameter has effect only in 802.3ad mode and is available through SysFs interface. Loading Makefile +1 −1 Original line number Diff line number Diff line VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 293 SUBLEVEL = 302 EXTRAVERSION = NAME = Blurry Fish Butt Loading arch/arm/boot/dts/bcm5301x.dtsi +2 −0 Original line number Diff line number Diff line Loading @@ -175,6 +175,8 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; }; }; Loading arch/arm/boot/dts/qcom/msm8916.dtsi +2 −2 Original line number Diff line number Diff line Loading @@ -25,8 +25,8 @@ #size-cells = <2>; aliases { sdhc1 = &sdhc_1; /* SDC1 eMMC slot */ sdhc2 = &sdhc_2; /* SDC2 SD card slot */ mmc0 = &sdhc_1; /* SDC1 eMMC slot */ mmc1 = &sdhc_2; /* SDC2 SD card slot */ }; chosen { }; Loading arch/arm/include/asm/tlb.h +8 −0 Original line number Diff line number Diff line Loading @@ -257,6 +257,14 @@ tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr tlb_add_flush(tlb, addr); } static inline void tlb_flush_pmd_range(struct mmu_gather *tlb, unsigned long address, unsigned long size) { tlb_add_flush(tlb, address); tlb_add_flush(tlb, address + size - PMD_SIZE); } #define pte_free_tlb(tlb, ptep, addr) __pte_free_tlb(tlb, ptep, addr) #define pmd_free_tlb(tlb, pmdp, addr) __pmd_free_tlb(tlb, pmdp, addr) #define pud_free_tlb(tlb, pudp, addr) pud_free((tlb)->mm, pudp) Loading Loading
Documentation/networking/bonding.txt +6 −5 Original line number Diff line number Diff line Loading @@ -191,11 +191,12 @@ ad_actor_sys_prio ad_actor_system In an AD system, this specifies the mac-address for the actor in protocol packet exchanges (LACPDUs). The value cannot be NULL or multicast. It is preferred to have the local-admin bit set for this mac but driver does not enforce it. If the value is not given then system defaults to using the masters' mac address as actors' system address. protocol packet exchanges (LACPDUs). The value cannot be a multicast address. If the all-zeroes MAC is specified, bonding will internally use the MAC of the bond itself. It is preferred to have the local-admin bit set for this mac but driver does not enforce it. If the value is not given then system defaults to using the masters' mac address as actors' system address. This parameter has effect only in 802.3ad mode and is available through SysFs interface. Loading
Makefile +1 −1 Original line number Diff line number Diff line VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 293 SUBLEVEL = 302 EXTRAVERSION = NAME = Blurry Fish Butt Loading
arch/arm/boot/dts/bcm5301x.dtsi +2 −0 Original line number Diff line number Diff line Loading @@ -175,6 +175,8 @@ gpio-controller; #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; }; }; Loading
arch/arm/boot/dts/qcom/msm8916.dtsi +2 −2 Original line number Diff line number Diff line Loading @@ -25,8 +25,8 @@ #size-cells = <2>; aliases { sdhc1 = &sdhc_1; /* SDC1 eMMC slot */ sdhc2 = &sdhc_2; /* SDC2 SD card slot */ mmc0 = &sdhc_1; /* SDC1 eMMC slot */ mmc1 = &sdhc_2; /* SDC2 SD card slot */ }; chosen { }; Loading
arch/arm/include/asm/tlb.h +8 −0 Original line number Diff line number Diff line Loading @@ -257,6 +257,14 @@ tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr tlb_add_flush(tlb, addr); } static inline void tlb_flush_pmd_range(struct mmu_gather *tlb, unsigned long address, unsigned long size) { tlb_add_flush(tlb, address); tlb_add_flush(tlb, address + size - PMD_SIZE); } #define pte_free_tlb(tlb, ptep, addr) __pte_free_tlb(tlb, ptep, addr) #define pmd_free_tlb(tlb, pmdp, addr) __pmd_free_tlb(tlb, pmdp, addr) #define pud_free_tlb(tlb, pudp, addr) pud_free((tlb)->mm, pudp) Loading