Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this page for instructions on how to get full permissions. Sorry for the inconvenience.

source.puri.sm migrated to a new server, see new ssh key fingerprint.

Commit 68aaf445 authored 5 years ago by David S. Miller

Browse files

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


Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

Signed-off-by: David S. Miller <davem@davemloft.net>

parents d00ee466 9e8312f5

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 198 additions and 68 deletions

Please register or to comment

Admin message

Admin message

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