Merge remote-tracking branch 'origin/kernel-update' into glibc-update2

diff --combined lfs/udev
index 082285c4f8183201de81ee21cf768a3b0b6d6e9a,5b8b602737a5c7dcd4c0c719779ff1ac2364edcc..6e31c90750ca4a3a72e9ce4d7ac4ba2efb781663
--- 1/lfs/udev
--- 2/lfs/udev
+++ b/lfs/udev
@@@ -30,7 -30,11 +30,7 @@@ THISAPP    = udev-$(VER
  DL_FILE    = $(THISAPP).tar.gz
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
 -ifeq "$(LFS_PASS)" "install"
 -      TARGET     = $(DIR_INFO)/$(THISAPP)-install
 -else
 -      TARGET     = $(DIR_INFO)/$(THISAPP)
 -endif
 +TARGET     = $(DIR_INFO)/$(THISAPP)
  
  ###############################################################################
  # Top-level Rules
@@@ -101,5 -105,11 +101,11 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        chmod 755 /etc/udev/dvb.sh
        touch /etc/udev/rules.d/30-persistent-network.rules
        cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist
+ 
+       # Install codel rules.
+       install -v -m 644 $(DIR_SRC)/config/udev/99-codel.rules \
+               /lib/udev/rules.d
+       install -m 755 $(DIR_SRC)/config/udev/enable_codel \
+               /lib/udev/enable_codel
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)