maint: 'master' should be merged into 'next'

* HACKING: Fix instructions merge instructions.

diff --git a/HACKING b/HACKING
index a603b6953ffa004ff826938de2c61b319464d3a7..8e7764baf4a281b9226070b848df401506fecf40 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -178,7 +178,7 @@
   over-arching change, you should use a dedicated topic branch, and
   only merge that back once it is reasonably stable.
 
-* The 'next' branch should be kept regularly merged into the 'master'
+* The 'master' branch should be kept regularly merged into the 'next'
   branch.  It is advisable to merge only after a set of related
   commits have been applied, to avoid introducing too much noise in
   the history.