diff --git a/kernel-development.md b/kernel-development.md
index b05e512..d682f40 100644
--- a/kernel-development.md
+++ b/kernel-development.md
@@ -1,5 +1,54 @@
 # OpenBMC kernel development
 
+The OpenBMC project maintains a fork of upstream Linux for patches that are not yet in the upstream kernel. The general policy is that code must be upstream first. Exceptions can be made on a case-by-case basis. If in doubt, start a dicsusion on the mailing list.
+
+The kernel tree hosted at https://github.com/openbmc/linux contains the set of patches that we carry. Ideally there would be no patches carried, as everything should be upstream.
+
+Your code will make it into the OpenBMC tree in these ways, from most to least desirable:
+1. When the OpenBMC kernel moves to a new upstream release
+2. By backporting upstream commits from a newer kernel version to the OpenBMC kernel
+3. Patches included in the OpenBMC tree temporarily
+
+## TL;DR
+
+If you require a patch added to the tree, follow these steps:
+
+1. Submit your patch upstream. It doesn't need to be upstream, but it should be on it's way
+2. Use ```git format-patch --subject-prefix="PATCH linux dev-4.7" --to=openbmc@lists.ozlabs.org --to=joel@jms.id.au``` to create a formatted patch
+
+## Developing a new driver
+
+When developing a new driver, your goal is to have the code accepted upstream. The first step should be to check that there is no existing driver for the hardware you wish to support. Check the OpenBMC `-dev` tree, check upstream, and if you do not find support there ask on the mailing list.
+
+Once you are sure a driver needs to be written, you should develop and test the driver, before sending it upstream to the relevant maintainers. You should feel welcome to cc the OpenBMC list when sending upstream, so other kernel developers can provide input where appropraite. Be sure to follow the (upstream development process)[https://www.kernel.org/doc/Documentation/SubmittingPatches].
+
+In the past patches underwent 'pre-review' on the OpenBMC mailing list. While this is useful for developers who are not familiar with writing kenrel code, it has lead to confusion about the upstreaming process, so now we do all of our development in the community.
+
+Once the driver has been accepted upstream, send the good news to the OpenBMC list with a reference to the upstream tree. This may be Linus' tree, or it might be one of the subsystem maintainers. From there the OpenBMC kenrel team can decide how best to include your code in the OpenBMC tree.
+
+### Exceptions
+
+There are cases where waiting for upstream acceptance will delay the bring-up of a new system. This should be avoided through careful planning and early development of the features upstream, but where this has not happened we can chose to carry the patches in the OpenBMC tree while the upstream development is ongoing.
+
+Another exception to the upstream first rule is where patches are modifying files that are not upstream. This currently includes the aspeed board file `arch/arm/mach-aspeed/aspeed.c`, and the device tree source files `dtbs`. The board file should go away when we get drivers written for all of the functionaltiy; for now it contains some hacks relating to LPC and early init.
+
+## Getting existing code in the tree
+
+The OpenBMC kernel is currently based on the 4.7 series. If there is upstream code you would like backported, send it to hte list. Be sure to include the upstream commit SHA in the commit message.
+
+## Testing
+
+When moifying the tree we currently test on the following platforms:
+
+ - Palmetto, an OpenPower Power8 box containing an ast2400 with NCSI networking
+ - ast2500-evb, the Aspeed dev board with two PHYs
+ - Witherspoon, an OpenPower Power9 box containing an ast2500 with NCSI networking
+ - qemu-plametto and qemu-romulus
+
+Before submitting patches it is recommended you boot test on at least the Qemu platforms, and whatever hardware you have availaible.
+
+# Tips and Tricks
+
 Some general hints for kernel development
 
 ## Out-of-tree builds
@@ -24,7 +73,7 @@
  build/tmp/deploy/images/palmetto/
 ```
 
-# Building a uImage
+## Building a uImage
 
 To build a uImage (for example, to netboot):