On Sun, Jul 05, 2015 at 01:56:54AM +0900, Masahiro Yamada wrote: > Update the files under scripts/kconfig/ to match Linux 4.1. > Some Kconfig sources have diverged from those in the kernel, > so commit-base syncing was done not to lose U-Boot specific updates. > > The commits cherry-picked from Linux are: > > [1] commit be8af2d54a66911693eddc556e4f7a866670082b > Author: Bjørn Forsman <bjorn.fors...@gmail.com> > kconfig/lxdialog: get ncurses CFLAGS with pkg-config > > [2] commit 3943f42c11896ce82ad3da132c8a5630313bdd0e > Author: Andrey Utkin <andrey.krieger.ut...@gmail.com> > Replace mentions of "list_struct" to "list_head" > > [3] commit e4e458b45c5861808674eebfea94cee2258bb2ea > Author: Arjun Sreedharan <arjun...@gmail.com> > calloc/xcalloc: Fix argument order > > [4] commit 09950bc256e3628d275f90e016e6f5a039fbdcab > Author: Olof Johansson <o...@lixom.net> > merge_config.sh: Display usage if given too few arguments > > [5] commit b6a2ab2cd4739a9573ed41677e53171987b8da34 > Author: Colin Ian King <colin.k...@canonical.com> > kconfig: use va_end to match corresponding va_start > > [6] commit 70529b1a1784503169416df19ce3d68746401340 > Author: Michal Marek <mma...@suse.cz> > kconfig: Get rid of the P() macro in headers > > [7] commit 463157444e377bf9b279101b1f16a94c4648c03a > Author: Michal Marek <mma...@suse.cz> > kconfig: Remove dead code > > [8] commit ad8d40cda3ad22ad9e8863d55a5c88f85c0173f0 > Author: Michal Marek <mma...@suse.cz> > kconfig: Remove unnecessary prototypes from headers > > [9] commit de4619937229378e81f95e99c9866acc8e207d34 > Author: Masahiro Yamada <yamada.masah...@socionext.com> > kbuild: mergeconfig: fix "jobserver unavailable" warning > > [10] commit b9fe99c5b994c6ddc57780993966b18899526c0b > Author: Masahiro Yamada <yamada.masah...@socionext.com> > kbuild: mergeconfig: move an error check to merge_config.sh > > [11] commit 371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d > Author: Masahiro Yamada <yamada.masah...@socionext.com> > kbuild: mergeconfig: remove redundant $(objtree) > > [12] commit 3a975b8cfcbe026b535f83bde9a3c009bae214f9 > Author: Masahiro Yamada <yamada.masah...@socionext.com> > merge_config.sh: improve indentation > > [13] commit bc8f8f5fc47cd02c2c5f3580dac2fe6695af1edd > Author: Masahiro Yamada <yamada.masah...@socionext.com> > merge_config.sh: rename MAKE to RUNMAKE > > [14] commit 63a91033d52e64a22e571fe84924c0b7f21c280d > Author: Masahiro Yamada <yamada.masah...@socionext.com> > kbuild: add generic mergeconfig target, %.config > > [15] commit 1cba0c305758c3c1786ecaceb03e142c95a4edc9 > Author: Michal Marek <mma...@suse.cz> > kconfig: Simplify Makefile > > [16] commit 0a1f00a1c86421cc07cec87011c7cf4df68ee54b > Author: Michal Marek <mma...@suse.cz> > kconfig: Do not print status messages in make -s mode > > Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com> > Signed-off-by: Bjørn Forsman <bjorn.fors...@gmail.com> > Signed-off-by: Andrey Utkin <andrey.krieger.ut...@gmail.com> > Signed-off-by: Jiri Kosina <jkos...@suse.cz> > Signed-off-by: Arjun Sreedharan <arjun...@gmail.com> > Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> > Signed-off-by: Olof Johansson <o...@lixom.net> > Signed-off-by: Colin Ian King <colin.k...@canonical.com> > Signed-off-by: Michal Marek <mma...@suse.cz>
Applied to u-boot/master, thanks! -- Tom
signature.asc
Description: Digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot