Branches

ath10k sdio and usb branches

Most branches in this repo is based on Kalle Valo's master branch in the official ath10k tree:

git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

Each branch uses one of Kalle's tags as starting point. Example:

ath-201702230911-ath10k-sdio-usb

The above branch is based on the tag: ath-201702230911

I guess the tag names are self-explanatory...

The master branch is pointing to the latest ath-<DATE>-ath10k-<DESCRIPTION> branch and will be continuously rebased in order to always point to the latest version of the patches.

Mainline branches

Some branches are based on linux mainline releases. These branches have a name beginning with a mainline version followed by ath10k-sdio:

vX.Y-ath10k-sdio

All SDIO patches have been added on top the kernel release, so it should be fairly easy to cherry-pick or generate a series of patches (if you want'to apply the patches to a custom branch).

Generate patches

The below instructions summarize the process of generating a patch series from one branch and how to apply them on another.

First, generate the patches:

git clone https://github.com/erstrom/linux-ath.git
cd linux-ath
    git checkout v4.19-ath10k-sdio
git format-patch v4.19 -o patches-v4.19-ath10k-sdio

The next step is to apply the patches on your tree:

cd /path/to/your/tree
git checkout your-dev-branch
git am -3 /path/to/patches-v4.19-ath10k-sdio/*

The -3 option to git am is recommended in case there will be conflicts (which is quite likely if there is a big difference in kernel versions)