[linux] 09/09: Merge branch 'm68k' of https://github.com/glaubitz/linux-debian

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 1d233f0650e85b930af4d335daa75777a5e2120a
Merge: aca58f8 18a83eb
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jun 6 20:43:50 2017 +0100

    Merge branch 'm68k' of https://github.com/glaubitz/linux-debian
    
    Move the added changelog lines into a new entry, as 4.11.3-1~exp1 has
    already been uploaded.

 debian/changelog                                           | 14 ++++++++++++++
 debian/installer/m68k/modules/m68k/affs-modules            |  1 +
 debian/installer/m68k/modules/m68k/hfs-modules             |  1 +
 .../m68k/modules/m68k/{nic-shared-modules => nic-modules}  | 13 ++++---------
 debian/installer/m68k/modules/m68k/nic-shared-modules      | 14 +-------------
 debian/installer/m68k/modules/m68k/pata-modules            |  7 +++++++
 debian/installer/m68k/modules/m68k/scsi-core-modules       |  1 +
 debian/installer/m68k/modules/m68k/scsi-modules            |  4 ++++
 8 files changed, 33 insertions(+), 22 deletions(-)

diff --cc debian/changelog
index b9df03b,25351c6..2b14850
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,17 @@@
++linux (4.11.3-1~exp2) UNRELEASED; urgency=medium
++
++  [ John Paul Adrian Glaubitz ]
++  * [m68k] udeb: Build affs-modules package
++  * [m68k] udeb: Build hfs-modules package
++  * [m68k] udeb: Build nic-modules package
++  * [m68k] udeb: Build pata-modules package
++  * [m68k] udeb: Build scsi-core-modules package
++  * [m68k] udeb: Move non-shared modules from nic-shared-modules to nic-modules
++  * [m68k] udeb: Add buddha, falconide, gayle, macide, q40ide to pata-modules
++  * [m68k] udeb: Add atari_scsi, mac_esp, mac_scsi to scsi-modules
++
++ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 06 Jun 2017 20:43:11 +0100
++
  linux (4.11.3-1~exp1) experimental; urgency=medium
  
    * New upstream stable update:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git