Commit 6876a18d authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

parents 0ea1041b bbd6f0a9

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -8532,7 +8532,6 @@ IBM Power SRIOV Virtual NIC Device Driver 
M:	Dany Madden <drt@linux.ibm.com>

M:	Sukadev Bhattiprolu <sukadev@linux.ibm.com>

R:	Thomas Falcon <tlfalcon@linux.ibm.com>

R:	Lijun Pan <lijunp213@gmail.com>

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/ibm/ibmvnic.*

arch/arm/boot/dts/uniphier-pxs2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ 
			clocks = <&sys_clk 6>;

			reset-names = "ether";

			resets = <&sys_rst 6>;

			phy-mode = "rgmii";

			phy-mode = "rgmii-id";

			local-mac-address = [00 00 00 00 00 00];

			socionext,syscon-phy-mode = <&soc_glue 0>;

arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ 
			clocks = <&sys_clk 6>;

			reset-names = "ether";

			resets = <&sys_rst 6>;

			phy-mode = "rgmii";

			phy-mode = "rgmii-id";

			local-mac-address = [00 00 00 00 00 00];

			socionext,syscon-phy-mode = <&soc_glue 0>;

arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ 
			clocks = <&sys_clk 6>;

			reset-names = "ether";

			resets = <&sys_rst 6>;

			phy-mode = "rgmii";

			phy-mode = "rgmii-id";

			local-mac-address = [00 00 00 00 00 00];

			socionext,syscon-phy-mode = <&soc_glue 0>;
@@ -585,7 +585,7 @@ 
			clocks = <&sys_clk 7>;

			reset-names = "ether";

			resets = <&sys_rst 7>;

			phy-mode = "rgmii";

			phy-mode = "rgmii-id";

			local-mac-address = [00 00 00 00 00 00];

			socionext,syscon-phy-mode = <&soc_glue 1>;

drivers/net/bonding/bond_main.c

+4 −3
Original line number Diff line number Diff line
@@ -4391,9 +4391,7 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave) 
	int agg_id = 0;

	int ret = 0;



#ifdef CONFIG_LOCKDEP

	WARN_ON(lockdep_is_held(&bond->mode_lock));

#endif

	might_sleep();



	usable_slaves = kzalloc(struct_size(usable_slaves, arr,

					    bond->slave_cnt), GFP_KERNEL);
@@ -4406,7 +4404,9 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave) 
	if (BOND_MODE(bond) == BOND_MODE_8023AD) {

		struct ad_info ad_info;



		spin_lock_bh(&bond->mode_lock);

		if (bond_3ad_get_active_agg_info(bond, &ad_info)) {

			spin_unlock_bh(&bond->mode_lock);

			pr_debug("bond_3ad_get_active_agg_info failed\n");

			/* No active aggragator means it's not safe to use

			 * the previous array.
@@ -4414,6 +4414,7 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave) 
			bond_reset_slave_arr(bond);

			goto out;

		}

		spin_unlock_bh(&bond->mode_lock);

		agg_id = ad_info.aggregator_id;

	}

	bond_for_each_slave(bond, slave, iter) {