Conflicts: devlink/devlink.c Fixed the conflict by updating the numbering for all new attributes after the ones in master branch. Signed-off-by: David Ahern <dsahern@gmail.com> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| Makefile | ||
| devlink.c | ||
| mnlg.c | ||
| mnlg.h | ||
Conflicts: devlink/devlink.c Fixed the conflict by updating the numbering for all new attributes after the ones in master branch. Signed-off-by: David Ahern <dsahern@gmail.com> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| Makefile | ||
| devlink.c | ||
| mnlg.c | ||
| mnlg.h | ||