[linux] 02/02: Merge remote-tracking branch 'alioth/master'
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Tue Jun 21 19:45:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch master
in repository linux.
commit e25a0f09c39f1e9874c60057502e90ea27229cde
Merge: e4b00d2 8ee599f
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Tue Jun 21 20:44:48 2016 +0100
Merge remote-tracking branch 'alioth/master'
Conflicts:
debian/changelog
debian/changelog | 8 ++
debian/config/kernelarch-mips/config.loongson-2e | 92 ----------------
debian/config/kernelarch-mips/config.loongson-2f | 122 ---------------------
debian/config/kernelarch-mips/config.mips32r1 | 10 --
debian/config/kernelarch-mips/config.mips64r1 | 10 --
debian/config/mipsel/defines | 21 +---
debian/installer/mipsel/kernel-versions | 2 -
.../mipsel/modules/mipsel-loongson-2e/affs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/ata-modules | 1 -
.../modules/mipsel-loongson-2e/btrfs-modules | 1 -
.../modules/mipsel-loongson-2e/cdrom-core-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/core-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/crc-modules | 1 -
.../modules/mipsel-loongson-2e/crypto-dm-modules | 1 -
.../modules/mipsel-loongson-2e/crypto-modules | 1 -
.../modules/mipsel-loongson-2e/event-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/ext4-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/fat-modules | 1 -
.../mipsel-loongson-2e/firewire-core-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/fuse-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/hfs-modules | 1 -
.../modules/mipsel-loongson-2e/input-modules | 1 -
.../modules/mipsel-loongson-2e/isofs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/jfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/kernel-image | 1 -
.../mipsel/modules/mipsel-loongson-2e/loop-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/md-modules | 1 -
.../modules/mipsel-loongson-2e/minix-modules | 1 -
.../modules/mipsel-loongson-2e/multipath-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/nbd-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/nfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/nic-modules | 14 ---
.../modules/mipsel-loongson-2e/nic-shared-modules | 1 -
.../modules/mipsel-loongson-2e/nic-usb-modules | 1 -
.../mipsel-loongson-2e/nic-wireless-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/ntfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/pata-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/ppp-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/qnx4-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/sata-modules | 1 -
.../modules/mipsel-loongson-2e/scsi-core-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/scsi-modules | 6 -
.../modules/mipsel-loongson-2e/sound-modules | 1 -
.../modules/mipsel-loongson-2e/speakup-modules | 1 -
.../modules/mipsel-loongson-2e/squashfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/udf-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/usb-modules | 1 -
.../modules/mipsel-loongson-2e/usb-serial-modules | 1 -
.../modules/mipsel-loongson-2e/usb-storage-modules | 1 -
.../modules/mipsel-loongson-2e/virtio-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/xfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2e/zlib-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/affs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/ata-modules | 1 -
.../modules/mipsel-loongson-2f/btrfs-modules | 1 -
.../modules/mipsel-loongson-2f/cdrom-core-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/core-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/crc-modules | 1 -
.../modules/mipsel-loongson-2f/crypto-dm-modules | 1 -
.../modules/mipsel-loongson-2f/crypto-modules | 1 -
.../modules/mipsel-loongson-2f/event-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/ext4-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/fat-modules | 1 -
.../mipsel-loongson-2f/firewire-core-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/fuse-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/hfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/i2c-modules | 1 -
.../modules/mipsel-loongson-2f/input-modules | 1 -
.../modules/mipsel-loongson-2f/isofs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/jfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/kernel-image | 1 -
.../mipsel/modules/mipsel-loongson-2f/loop-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/md-modules | 1 -
.../modules/mipsel-loongson-2f/minix-modules | 1 -
.../modules/mipsel-loongson-2f/multipath-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/nbd-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/nfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/nic-modules | 14 ---
.../modules/mipsel-loongson-2f/nic-shared-modules | 1 -
.../modules/mipsel-loongson-2f/nic-usb-modules | 1 -
.../mipsel-loongson-2f/nic-wireless-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/ntfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/pata-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/ppp-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/qnx4-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/sata-modules | 1 -
.../modules/mipsel-loongson-2f/scsi-core-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/scsi-modules | 6 -
.../modules/mipsel-loongson-2f/sound-modules | 1 -
.../modules/mipsel-loongson-2f/speakup-modules | 1 -
.../modules/mipsel-loongson-2f/squashfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/udf-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/usb-modules | 1 -
.../modules/mipsel-loongson-2f/usb-serial-modules | 1 -
.../modules/mipsel-loongson-2f/usb-storage-modules | 1 -
.../modules/mipsel-loongson-2f/virtio-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/xfs-modules | 1 -
.../mipsel/modules/mipsel-loongson-2f/zlib-modules | 1 -
debian/installer/mipsel/package-list | 1 -
99 files changed, 10 insertions(+), 383 deletions(-)
diff --cc debian/changelog
index f6cc310,7c765ff..6fd7644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,12 @@@
-linux (4.7~rc4-1~exp1) UNRELEASED; urgency=medium
++linux (4.7~rc4-1~exp2) UNRELEASED; urgency=medium
++
++ [ Aurelien Jarno ]
++ * [mipsel] Remove loongson-2e and loongson-2f flavours (Closes: #827790).
++ * [mipsel/4kc-malta, mipsel/5kc-malta] Build for R2 ISA.
++
++ -- Ben Hutchings <ben at decadent.org.uk> Tue, 21 Jun 2016 20:43:50 +0100
++
+linux (4.7~rc4-1~exp1) experimental; urgency=medium
* New upstream release candidate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list