sync configs
restore comments
ignore generated files
restore comments
Merge commit '6cd09a98ca19728217e3ae6483c1311e046acceb' into jelly_3.4

Conflicts:
	block/genhd.c
	drivers/bluetooth/hci_ibs.c
	drivers/mmc/core/mmc.c
	drivers/tty/n_tty.c
	drivers/tty/tty_io.c
	drivers/usb/core/driver.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/u_ether.c
	drivers/usb/host/ehci-hub.c
	fs/buffer.c
	fs/ext4/ext4.h
	fs/ext4/inode.c
	fs/fat/inode.c
	fs/jbd2/transaction.c
	fs/super.c
	include/linux/mmc/card.h
	include/linux/sched.h
	include/linux/usb.h
	include/linux/usb/ch9.h
	include/net/cfg80211.h
	kernel/cpu.c
	kernel/fork.c
	kernel/futex.c
	kernel/hrtimer.c
	kernel/kthread.c
	kernel/printk.c
	kernel/sched/fair.c
	kernel/smp.c
	kernel/sys.c
	mm/oom_kill.c
	mm/page_alloc.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/sco.c
	net/bluetooth/smp.c
	net/core/datagram.c
	net/ipv4/devinet.c
	net/ipv4/fib_trie.c
	net/ipv4/inet_timewait_sock.c
	net/ipv4/netfilter/ip_tables.c
	net/ipv4/route.c
	net/ipv4/tcp_output.c
	net/ipv6/af_inet6.c
	net/ipv6/netfilter/ip6_tables.c