)]}'
{
  "commit": "673b41e04a035d760bc0aff83fa9ee24fd9c2779",
  "tree": "518c552dee1ddc1835d66161f09f5b3e8fb171bf",
  "parents": [
    "642e53ead6aea8740a219ede509a5d138fd4f780"
  ],
  "author": {
    "name": "Randy Dunlap",
    "email": "rdunlap@infradead.org",
    "time": "Sun Mar 29 09:12:31 2020 -0700"
  },
  "committer": {
    "name": "Linus Torvalds",
    "email": "torvalds@linux-foundation.org",
    "time": "Mon Mar 30 17:22:01 2020 -0700"
  },
  "message": "staging/octeon: fix up merge error\n\nThere\u0027s a semantic conflict in the Octeon staging network driver, which\nused the skb_reset_tc() function to reset skb state when re-using an\nskb.  But that inline helper function was removed in mainline by commit\n2c64605b590e (\"net: Fix CONFIG_NET_CLS_ACT\u003dn and\nCONFIG_NFT_FWD_NETDEV\u003d{y, m} build\").\n\nFix it by using skb_reset_redirect() instead.  Also move it out of the\n\nThis code path only ends up triggering if REUSE_SKBUFFS_WITHOUT_FREE is\nenabled, which in turn only happens if you don\u0027t have CONFIG_NETFILTER\nconfigured.  Which was how this wasn\u0027t caught by the usual allmodconfig\nbuilds.\n\nSigned-off-by: Randy Dunlap \u003crdunlap@infradead.org\u003e\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "b334cf89794ed7cda3becc56f65af6adf10dc458",
      "old_mode": 33188,
      "old_path": "drivers/staging/octeon/ethernet-tx.c",
      "new_id": "ab7dd8216006a4d858ff921963803965acf4c7b3",
      "new_mode": 33188,
      "new_path": "drivers/staging/octeon/ethernet-tx.c"
    }
  ]
}