diff --git a/debian/changelog b/debian/changelog index 4cd3d4bde..a53815ca4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,95 @@ linux (3.11~rc4-1~exp1) experimental; urgency=low -- Ben Hutchings Thu, 08 Aug 2013 13:09:47 +0200 +linux (3.10.7-1) unstable; urgency=low + + * New upstream stable update: + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.10.6 + - [arm] Modify vectors page to defend against ROP buffer overflow attacks + - [armel] 7790/1: Fix deferred mm switch on VIVT processors + - [armel] 7791/1: a.out: remove partial a.out support + - [powerpc] VPHN topology change updates all siblings + - hwmon: (max6697) fix MAX6581 ideality + - USB: mos7840: fix race in register handling + - USB: mos7840: fix race in led handling + - mac80211: fix duplicate retransmission detection + - mac80211: fix ethtool stats for non-station interfaces + - ixgbe: Fix Tx Hang issue with lldpad on 82598EB + - Bluetooth: ath3k: don't use stack memory for DMA + - Bluetooth: fix wrong use of PTR_ERR() in btusb + - svcrpc: fix gss-proxy xdr decoding oops + - svcrpc: fix gss_rpc_upcall create error + - svcrpc: fix kfree oops in gss-proxy code + - zram: avoid invalid memory access in zram_exit() + - zram: use zram->lock to protect zram_free_page() in swap free notify path + - zram: avoid double free in function zram_bvec_write() + - zram: avoid access beyond the zram device + - zram: protect sysfs handler from invalid memory access + - Revert "cpuidle: Quickly notice prediction failure in general case" + - cpufreq: Fix cpufreq driver module refcount balance after suspend/resume + - Revert "cpuidle: Quickly notice prediction failure for repeat mode" + - drm/radeon: Disable dma rings for bo moves on r6xx + - xen-blkfront: use a different scatterlist for each request + - drm/radeon: never unpin UVD bo v3 + - Btrfs: fix crash regarding to ulist_add_merge + - [s390] bitops: fix find_next_bit_left + - userns: unshare_userns(&cred) should not populate cred on failure + (CVE-2013-4205) + - ipv6: take rtnl_lock and mark mrt6 table as freed on namespace cleanup + - usbnet: do not pretend to support SG/TSO + - net_sched: Fix stack info leak in cbq_dump_wrr(). + - af_key: more info leaks in pfkey messages + - net_sched: info leak in atm_tc_dump_class() + - 8139cp: Add dma_mapping_error checking + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.10.7 + - [powerpc] Save the TAR register earlier + - [powerpc] tm: Fix context switching TAR, PPR and DSCR SPRs + - ext4: make sure group number is bumped after a inode allocation race + - regmap: cache: Make sure to sync the last register in a block + - hwmon: (adt7470) Fix incorrect return code check + - media: em28xx: fix assignment of the eeprom data + - ACPI / PM: Walk physical_node_list under physical_node_lock + - ALSA: 6fire: fix DMA issues with URB transfer_buffer usage + - Btrfs: release both paths before logging dir/changed extents + - LOCKD: Don't call utsname()->nodename from nlmclnt_setlockargs + - SUNRPC: Don't auto-disconnect from the local rpcbind socket + - SUNRPC: If the rpcbind channel is disconnected, fail the call to + unregister + - virtio/console: Quit from splice_write if pipe->nrbufs is 0 + - virtio/console: Add pipe_lock/unlock for splice_write + - virtio: console: fix race with port unplug and open/close + - virtio: console: fix race in port_fops_open() and port unplug + - virtio: console: clean up port data immediately at time of unplug + - virtio: console: fix raising SIGIO after port unplug + - virtio: console: return -ENODEV on all read operations after unplug + - drm/radeon: stop sending invalid UVD destroy msg + - ext4: flush the extent status cache during EXT4_IOC_SWAP_BOOT + - cifs: extend the buffer length enought for sprintf() using + - zram: allow request end to coincide with disksize + - reiserfs: fix deadlock in umount + - [x86] drm/i915: initialize gt_lock early with other spin locks + + [ Ben Hutchings ] + * [x86] Enable ASUS_OLED as module (Closes: #680016) + * [armel/orion5x] I2C: mv64xxx: fix race between FSM/interrupt and process + context (Closes: #622325) + * [rt] Update to 3.10.6-rt3 + - hpsa: fix warning with smp_processor_id() in preemptible + * [arm] Change SERIAL_8250_PCI from built-in to module + * net: Change WIZNET_W5{1,3}00 from built-in(!) to module + * net: Change DROP_MONITOR from built-in to module + * netlink: Change NETLINK_DIAG from built-in to module; enable on + armel/{iop32x,ixp4xx,orion5x} + + [ Thorsten Glaser ] + * [m68k] debian/patches/bugfix/m68k/atari-irqs.patch: patch from mailing list + to silence IRQ problems on Atari platforms with multi-platform kernel + * [m68k] debian/patches/bugfix/m68k/type-fix-div64.patch: patch from Andreas + Schwab to handle do_div being called with a non-u32 second argument + * [m68k] begin working on d-i kernel configs (just enough to not FTBFS) + + -- Ben Hutchings Sat, 17 Aug 2013 22:35:15 +0200 + linux (3.10.5-1) unstable; urgency=low * New upstream stable update: diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index d039daeb0..ea407fcb9 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -2,8 +2,6 @@ featuresets: none rt -flavours: - amd64 kernel-arch: x86 [build] diff --git a/debian/config/armel/config b/debian/config/armel/config index 8afcb0986..4af3ecfaf 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -111,6 +111,11 @@ CONFIG_YAM=m CONFIG_THERMAL=y CONFIG_CPU_THERMAL=m +## +## file: drivers/tty/serial/8250/Kconfig +## +CONFIG_SERIAL_8250_PCI=m + ## ## file: drivers/virtio/Kconfig ## diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced index 0d64c6834..8b6265e8b 100644 --- a/debian/config/armel/config-reduced +++ b/debian/config/armel/config-reduced @@ -56,7 +56,6 @@ CONFIG_IPV6=m ## file: net/netlink/Kconfig ## # CONFIG_NETLINK_MMAP is not set -# CONFIG_NETLINK_DIAG is not set ## ## file: security/yama/Kconfig diff --git a/debian/config/config b/debian/config/config index 3189e094b..482bf3ba7 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2431,8 +2431,8 @@ CONFIG_VIA_VELOCITY=m ## file: drivers/net/ethernet/wiznet/Kconfig ## CONFIG_NET_VENDOR_WIZNET=y -CONFIG_WIZNET_W5100=y -CONFIG_WIZNET_W5300=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m ## ## file: drivers/net/fddi/Kconfig @@ -4675,7 +4675,7 @@ CONFIG_NETPRIO_CGROUP=m CONFIG_BPF_JIT=y CONFIG_NET_PKTGEN=m # CONFIG_NET_TCPPROBE is not set -CONFIG_NET_DROP_MONITOR=y +CONFIG_NET_DROP_MONITOR=m CONFIG_WIRELESS=y ## @@ -5140,7 +5140,7 @@ CONFIG_IP_VS_PE_SIP=m ## file: net/netlink/Kconfig ## CONFIG_NETLINK_MMAP=y -CONFIG_NETLINK_DIAG=y +CONFIG_NETLINK_DIAG=m ## ## file: net/nfc/Kconfig diff --git a/debian/config/defines b/debian/config/defines index bbf0f64c8..997fd62b8 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,8 @@ [abi] abiname: trunk +ignore-changes: +# Pointless function, removed in 3.10.6 + menu_hrtimer_cancel [base] arches: diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 019b1b2f5..8ffd7d398 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1263,6 +1263,11 @@ CONFIG_SFI=y ## CONFIG_SPI_TOPCLIFF_PCH=m +## +## file: drivers/staging/asus_oled/Kconfig +## +CONFIG_ASUS_OLED=m + ## ## file: drivers/staging/comedi/Kconfig ## diff --git a/debian/installer/m68k/kernel-versions b/debian/installer/m68k/kernel-versions index 5c3677486..86e3e98f3 100644 --- a/debian/installer/m68k/kernel-versions +++ b/debian/installer/m68k/kernel-versions @@ -1,4 +1,2 @@ # arch version flavour installedname suffix build-depends -m68k - amiga - y - -m68k - atari - y - -m68k - mac - y - +m68k - m68k - - - diff --git a/debian/installer/m68k/modules/m68k-mac/btrfs-modules b/debian/installer/m68k/modules/m68k-mac/btrfs-modules deleted file mode 100644 index e261e1388..000000000 --- a/debian/installer/m68k/modules/m68k-mac/btrfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/cdrom-core-modules b/debian/installer/m68k/modules/m68k-mac/cdrom-core-modules deleted file mode 100644 index 3ff69b48f..000000000 --- a/debian/installer/m68k/modules/m68k-mac/cdrom-core-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/crc-modules b/debian/installer/m68k/modules/m68k-mac/crc-modules deleted file mode 100644 index 7e00de705..000000000 --- a/debian/installer/m68k/modules/m68k-mac/crc-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/crypto-modules b/debian/installer/m68k/modules/m68k-mac/crypto-modules deleted file mode 100644 index 3a1e862b4..000000000 --- a/debian/installer/m68k/modules/m68k-mac/crypto-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/fat-modules b/debian/installer/m68k/modules/m68k-mac/fat-modules deleted file mode 100644 index 274584eb6..000000000 --- a/debian/installer/m68k/modules/m68k-mac/fat-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/fuse-modules b/debian/installer/m68k/modules/m68k-mac/fuse-modules deleted file mode 100644 index 0b6ba0c8c..000000000 --- a/debian/installer/m68k/modules/m68k-mac/fuse-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/isofs-modules b/debian/installer/m68k/modules/m68k-mac/isofs-modules deleted file mode 100644 index da4fa9a3c..000000000 --- a/debian/installer/m68k/modules/m68k-mac/isofs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/jfs-modules b/debian/installer/m68k/modules/m68k-mac/jfs-modules deleted file mode 100644 index 7e4d912b9..000000000 --- a/debian/installer/m68k/modules/m68k-mac/jfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/kernel-image b/debian/installer/m68k/modules/m68k-mac/kernel-image deleted file mode 100644 index 1bb8bf6d7..000000000 --- a/debian/installer/m68k/modules/m68k-mac/kernel-image +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/debian/installer/m68k/modules/m68k-mac/md-modules b/debian/installer/m68k/modules/m68k-mac/md-modules deleted file mode 100644 index 26115e10b..000000000 --- a/debian/installer/m68k/modules/m68k-mac/md-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/nbd-modules b/debian/installer/m68k/modules/m68k-mac/nbd-modules deleted file mode 100644 index 3c9b3e5d4..000000000 --- a/debian/installer/m68k/modules/m68k-mac/nbd-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/nic-shared-modules b/debian/installer/m68k/modules/m68k-mac/nic-shared-modules deleted file mode 100644 index 3cf0df91c..000000000 --- a/debian/installer/m68k/modules/m68k-mac/nic-shared-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include "../m68k/nic-shared-modules" -libphy diff --git a/debian/installer/m68k/modules/m68k-mac/ppp-modules b/debian/installer/m68k/modules/m68k-mac/ppp-modules deleted file mode 100644 index 1f26aa1ee..000000000 --- a/debian/installer/m68k/modules/m68k-mac/ppp-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/scsi-modules b/debian/installer/m68k/modules/m68k-mac/scsi-modules deleted file mode 100644 index b9219d34e..000000000 --- a/debian/installer/m68k/modules/m68k-mac/scsi-modules +++ /dev/null @@ -1 +0,0 @@ -#include "../m68k/scsi-modules" diff --git a/debian/installer/m68k/modules/m68k-mac/squashfs-modules b/debian/installer/m68k/modules/m68k-mac/squashfs-modules deleted file mode 100644 index 42d77887a..000000000 --- a/debian/installer/m68k/modules/m68k-mac/squashfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/udf-modules b/debian/installer/m68k/modules/m68k-mac/udf-modules deleted file mode 100644 index b90d7ee9b..000000000 --- a/debian/installer/m68k/modules/m68k-mac/udf-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k-mac/zlib-modules b/debian/installer/m68k/modules/m68k-mac/zlib-modules deleted file mode 100644 index e02ad64bf..000000000 --- a/debian/installer/m68k/modules/m68k-mac/zlib-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k/core-modules b/debian/installer/m68k/modules/m68k/core-modules new file mode 100644 index 000000000..f05d06298 --- /dev/null +++ b/debian/installer/m68k/modules/m68k/core-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/m68k/modules/m68k/ext2-modules b/debian/installer/m68k/modules/m68k/ext2-modules new file mode 100644 index 000000000..c407140bf --- /dev/null +++ b/debian/installer/m68k/modules/m68k/ext2-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/m68k/modules/m68k/ext3-modules b/debian/installer/m68k/modules/m68k/ext3-modules new file mode 100644 index 000000000..55ef7d7bc --- /dev/null +++ b/debian/installer/m68k/modules/m68k/ext3-modules @@ -0,0 +1,2 @@ +#include + diff --git a/debian/installer/m68k/modules/m68k/ext4-modules b/debian/installer/m68k/modules/m68k/ext4-modules new file mode 100644 index 000000000..394c577ce --- /dev/null +++ b/debian/installer/m68k/modules/m68k/ext4-modules @@ -0,0 +1 @@ +#include diff --git a/debian/installer/m68k/modules/m68k/jfs-modules b/debian/installer/m68k/modules/m68k/jfs-modules deleted file mode 100644 index 7e4d912b9..000000000 --- a/debian/installer/m68k/modules/m68k/jfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/m68k/modules/m68k/nic-shared-modules b/debian/installer/m68k/modules/m68k/nic-shared-modules index 6822f9712..4f74c1f9e 100644 --- a/debian/installer/m68k/modules/m68k/nic-shared-modules +++ b/debian/installer/m68k/modules/m68k/nic-shared-modules @@ -1,11 +1,19 @@ +#include +82596 ? 8390 ? +8390p ? +7990 ? a2065 ? apne ? ariadne ? ariadne2 ? +atarilance ? dummy hydra ? +mac89x0 ? +macsonic ? zorro8390 ? ne ? atari_ethernec ? +smc91x ? libphy diff --git a/debian/installer/m68k/package-list b/debian/installer/m68k/package-list index 953293287..5066e0557 100644 --- a/debian/installer/m68k/package-list +++ b/debian/installer/m68k/package-list @@ -3,6 +3,7 @@ # architecture, which is derived from the files in the modules directory. # It overwrites specifications from /usr/share/kernel-wedge/package-list. # -Package: kernel-image -Provides: loop-modules, ext2-modules, ext3-modules -#Provides_mac: loop-modules, ext2-modules, ext3-modules, hfs-modules + +#Package: ide-modules +# add kernel/drivers/* I think +# also SCSI drivers are now modular… diff --git a/debian/patches/bugfix/m68k/atari-irqs.patch b/debian/patches/bugfix/m68k/atari-irqs.patch new file mode 100644 index 000000000..0ff36ed57 --- /dev/null +++ b/debian/patches/bugfix/m68k/atari-irqs.patch @@ -0,0 +1,18 @@ +From: Thorsten Glaser +Description: m68k: handle Atari interrupts in multi-platform kernels +Origin: http://thread.gmane.org/gmane.linux.debian.devel.kernel/91476/focus=5003 +Forwarded: http://thread.gmane.org/gmane.linux.ports.m68k/5009 + +--- a/arch/m68k/include/asm/irqflags.h ++++ b/arch/m68k/include/asm/irqflags.h +@@ -67,6 +67,10 @@ static inline void arch_local_irq_restor + + static inline bool arch_irqs_disabled_flags(unsigned long flags) + { ++ if (MACH_IS_ATARI) { ++ /* Ignore HSYNC = ipl 2 on Atari */ ++ return (flags & ~(ALLOWINT | 0x200)) != 0; ++ } + return (flags & ~ALLOWINT) != 0; + } + diff --git a/debian/patches/series b/debian/patches/series index dff2432f9..8d961e54b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -77,3 +77,6 @@ features/all/efi-autoload-efivars.patch bugfix/m68k/ethernat-kconfig.patch bugfix/all/irq-Always-define-devm_-request_threaded-free-_irq.patch + +# m68k IRQ bugfix +bugfix/m68k/atari-irqs.patch