diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-26 23:42:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-26 23:42:21 -0500 |
| commit | a88e7d27099a9c7df7596e520d01024d5dc32cbf (patch) | |
| tree | 9277a5b7240824c8e784dd8ce23f589b6af00bfa /crypto/algif_aead.c | |
| parent | e9c433af4f408c413bbc6c9626bbfd481f1a3c02 (diff) | |
| parent | 28af66d69be75498be36e7b664eff3a34c4549ad (diff) | |
| download | linux-crypto-a88e7d27099a9c7df7596e520d01024d5dc32cbf.tar.gz linux-crypto-a88e7d27099a9c7df7596e520d01024d5dc32cbf.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.
Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/algif_aead.c')
0 files changed, 0 insertions, 0 deletions