Commit Graph

2 Commits

Author SHA1 Message Date
Ben Hutchings ae5e9182c1 Update feature patch format
Use git mailbox format with the added line 'commit <id> upstream', as
in the stable series.

Where a patch has been committed upstream unchanged except for the
commit message, use the committed version.

This covers almost all features aside from aufs2, speakup, openvz,
vserver and xen-pvops.


svn path=/dists/sid/linux-2.6/; revision=15771
2010-05-26 04:02:28 +00:00
Ben Hutchings b074367c42 Apply some vlan driver enhancements from 2.6.33 and 2.6.34
vlan/macvlan: propagate transmission state to upper layers
macvlan: add GRO bit to features mask
macvlan: allow multiple driver backends
Add macvtap driver (Closes: #568755)

svn path=/dists/sid/linux-2.6/; revision=15752
2010-05-19 04:29:24 +00:00