Makefile | 2 1 + 1 - 0 !
archival/libarchive/Kbuild.src | 4 2 + 2 - 0 !
editors/sed.c | 6 3 + 3 - 0 !
findutils/find.c | 10 9 + 1 - 0 !
libbb/lineedit.c | 6 2 + 4 - 0 !
loginutils/getty.c | 6 6 + 0 - 0 !
util-linux/mdev.c | 41 24 + 17 - 0 !
util-linux/volume_id/ext.c | 52 48 + 4 - 0 !
8 files changed, 95 insertions(+), 32 deletions(-)

 upstream diff between 1.20.0 and 1.20.1 versions

shell/ash.c | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

---

networking/ifupdown.c | 20 12 + 8 - 0 !
1 file changed, 12 insertions(+), 8 deletions(-)

---

miscutils/man.c | 14 4 + 10 - 0 !
1 file changed, 4 insertions(+), 10 deletions(-)

---

archival/libarchive/get_header_tar.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

procps/ps.c | 40 29 + 11 - 0 !
1 file changed, 29 insertions(+), 11 deletions(-)

---

include/bb_e2fs_defs.h | 20 19 + 1 - 0 !
util-linux/mkfs_ext2.c | 11 4 + 7 - 0 !
2 files changed, 23 insertions(+), 8 deletions(-)

---

Makefile | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 the only remaining difference between upstream 1.20.2 and 1.20.1

This is upstream "stable series" change.

include/libbb.h | 2 1 + 1 - 0 !
libbb/messages.c | 2 1 + 1 - 0 !
shell/ash.c | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 busybox sh sets but does not export path
Bug: http://bugs.debian.org/329406
Bug: http://bugs.debian.org/679377

Makefile.flags | 7 6 + 1 - 0 !
1 file changed, 6 insertions(+), 1 deletion(-)

---

init/init.c | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 skip non-existing devices in inittab
Bug-Debian: http://bugs.debian.org/541115

util-linux/Config.src | 3 1 + 2 - 0 !
util-linux/Kbuild.src | 4 2 + 2 - 0 !
util-linux/mount.c | 41 3 + 38 - 0 !
util-linux/umount.c | 8 4 + 4 - 0 !
util-linux/xmount.c | 70 70 + 0 - 0 !
util-linux/xmount.h | 101 101 + 0 - 0 !
6 files changed, 181 insertions(+), 46 deletions(-)

 [patch 18/19] (u)mount: freebsd support

Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>

util-linux/swaponoff.c | 8 3 + 5 - 0 !
util-linux/xmount.c | 10 10 + 0 - 0 !
util-linux/xmount.h | 16 10 + 6 - 0 !
3 files changed, 23 insertions(+), 11 deletions(-)

 [patch 19/19] swaponoff: freebsd support


Signed-off-by: Jeremie Koenig <jk@jk.fr.eu.org>

modutils/modprobe.c | 14 11 + 3 - 0 !
1 file changed, 11 insertions(+), 3 deletions(-)

 modprobe: read modules.builtin
Bug-Debian: http://bugs.debian.org/652672

This allows explicit probing to succeed when the requested module
is actually built-in, and corrects the error message for removal.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

include/platform.h | 8 7 + 1 - 0 !
1 file changed, 7 insertions(+), 1 deletion(-)

 dont force no alignment for s390

util-linux/mount.c | 7 3 + 4 - 0 !
1 file changed, 3 insertions(+), 4 deletions(-)

 stop checking ancient kernel version for nfs mount